[DRE-commits] [berkshelf-api] 01/06: Imported Upstream version 2.2.0
Hleb Valoshka
tsfgnu-guest at moszumanska.debian.org
Fri Aug 5 14:31:28 UTC 2016
This is an automated email from the git hooks/post-receive script.
tsfgnu-guest pushed a commit to branch master
in repository berkshelf-api.
commit c136b4a5256d72f4947b0a63d4d6e3492ed4552e
Author: Hleb Valoshka <375gnu at gmail.com>
Date: Fri Aug 5 16:21:27 2016 +0300
Imported Upstream version 2.2.0
---
README.md | 6 ++++++
berkshelf-api.gemspec | 24 ++++++++++++++--------
lib/berkshelf/api.rb | 2 ++
lib/berkshelf/api/version.rb | 2 +-
spec/spec_helper.rb | 1 -
.../api/cache_builder/worker/github_spec.rb | 2 +-
spec/unit/berkshelf/api/cache_builder_spec.rb | 4 ++--
spec/unit/berkshelf/api/cache_manager_spec.rb | 10 +++++----
spec/unit/berkshelf/api/endpoint/v1_spec.rb | 4 ++--
9 files changed, 35 insertions(+), 20 deletions(-)
diff --git a/README.md b/README.md
index 4de3f0c..0288eb2 100644
--- a/README.md
+++ b/README.md
@@ -8,6 +8,12 @@ A server which indexes cookbooks from various sources and hosts it over a REST A
The API server can be installed in two ways; from a Chef Cookbook (recommended) and from a Rubygem.
+## Supports
+
+Chef >= 12.2
+Ubuntu 12.04/16.04
+RHEL/CentOS 6.x/7.x
+
### Cookbook install
#### Basic
diff --git a/berkshelf-api.gemspec b/berkshelf-api.gemspec
index a8284e5..c6ec62e 100644
--- a/berkshelf-api.gemspec
+++ b/berkshelf-api.gemspec
@@ -5,11 +5,11 @@
Gem::Specification.new do |s|
s.name = "berkshelf-api"
- s.version = "2.1.3"
+ s.version = "2.2.0"
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.authors = ["Jamie Winsor", "Andrew Garson"]
- s.date = "2016-02-20"
+ s.date = "2016-08-03"
s.description = "Berkshelf dependency API server"
s.email = ["jamie at vialstudios.com", "agarson at riotgames"]
s.executables = ["berks-api"]
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
s.homepage = "https://github.com/berkshelf/berkshelf-api"
s.licenses = ["Apache 2.0"]
s.require_paths = ["lib"]
- s.required_ruby_version = Gem::Requirement.new(">= 1.9.3")
+ s.required_ruby_version = Gem::Requirement.new(">= 2.1.0")
s.rubygems_version = "1.8.23"
s.summary = "A server which indexes cookbooks from various sources and hosts it over a REST API"
s.test_files = ["spec/fixtures/cookbooks/example_cookbook/metadata.rb", "spec/spec_helper.rb", "spec/support/actor_mocking.rb", "spec/support/chef_server.rb", "spec/support/human_reaable.rb", "spec/unit/berkshelf/api/application_spec.rb", "spec/unit/berkshelf/api/cache_builder/worker/chef_server_spec.rb", "spec/unit/berkshelf/api/cache_builder/worker/file_store_spec.rb", "spec/unit/berkshelf/api/cache_builder/worker/github_spec.rb", "spec/unit/berkshelf/api/cache_builder/worker/superma [...]
@@ -26,44 +26,50 @@ Gem::Specification.new do |s|
s.specification_version = 4
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+ s.add_runtime_dependency(%q<activesupport>, ["~> 4.0"])
s.add_runtime_dependency(%q<archive>, ["= 0.0.6"])
s.add_runtime_dependency(%q<buff-config>, ["~> 1.0"])
s.add_runtime_dependency(%q<celluloid>, ["~> 0.16"])
s.add_runtime_dependency(%q<celluloid-io>, ["~> 0.16"])
- s.add_runtime_dependency(%q<grape>, ["~> 0.6"])
+ s.add_runtime_dependency(%q<grape>, ["~> 0.14"])
s.add_runtime_dependency(%q<grape-msgpack>, ["~> 0.1"])
s.add_runtime_dependency(%q<hashie>, ["< 4.0.0", ">= 2.0.4"])
s.add_runtime_dependency(%q<octokit>, ["< 5.0.0", ">= 3.0.0"])
+ s.add_runtime_dependency(%q<rack>, ["~> 1.0"])
s.add_runtime_dependency(%q<reel>, ["~> 0.6.0"])
s.add_runtime_dependency(%q<ridley>, ["~> 4.4"])
s.add_runtime_dependency(%q<semverse>, ["~> 1.0"])
- s.add_runtime_dependency(%q<varia_model>, ["< 0.5.0", ">= 0.4.0"])
+ s.add_runtime_dependency(%q<varia_model>, ["~> 0.4"])
else
+ s.add_dependency(%q<activesupport>, ["~> 4.0"])
s.add_dependency(%q<archive>, ["= 0.0.6"])
s.add_dependency(%q<buff-config>, ["~> 1.0"])
s.add_dependency(%q<celluloid>, ["~> 0.16"])
s.add_dependency(%q<celluloid-io>, ["~> 0.16"])
- s.add_dependency(%q<grape>, ["~> 0.6"])
+ s.add_dependency(%q<grape>, ["~> 0.14"])
s.add_dependency(%q<grape-msgpack>, ["~> 0.1"])
s.add_dependency(%q<hashie>, ["< 4.0.0", ">= 2.0.4"])
s.add_dependency(%q<octokit>, ["< 5.0.0", ">= 3.0.0"])
+ s.add_dependency(%q<rack>, ["~> 1.0"])
s.add_dependency(%q<reel>, ["~> 0.6.0"])
s.add_dependency(%q<ridley>, ["~> 4.4"])
s.add_dependency(%q<semverse>, ["~> 1.0"])
- s.add_dependency(%q<varia_model>, ["< 0.5.0", ">= 0.4.0"])
+ s.add_dependency(%q<varia_model>, ["~> 0.4"])
end
else
+ s.add_dependency(%q<activesupport>, ["~> 4.0"])
s.add_dependency(%q<archive>, ["= 0.0.6"])
s.add_dependency(%q<buff-config>, ["~> 1.0"])
s.add_dependency(%q<celluloid>, ["~> 0.16"])
s.add_dependency(%q<celluloid-io>, ["~> 0.16"])
- s.add_dependency(%q<grape>, ["~> 0.6"])
+ s.add_dependency(%q<grape>, ["~> 0.14"])
s.add_dependency(%q<grape-msgpack>, ["~> 0.1"])
s.add_dependency(%q<hashie>, ["< 4.0.0", ">= 2.0.4"])
s.add_dependency(%q<octokit>, ["< 5.0.0", ">= 3.0.0"])
+ s.add_dependency(%q<rack>, ["~> 1.0"])
s.add_dependency(%q<reel>, ["~> 0.6.0"])
s.add_dependency(%q<ridley>, ["~> 4.4"])
s.add_dependency(%q<semverse>, ["~> 1.0"])
- s.add_dependency(%q<varia_model>, ["< 0.5.0", ">= 0.4.0"])
+ s.add_dependency(%q<varia_model>, ["~> 0.4"])
end
end
diff --git a/lib/berkshelf/api.rb b/lib/berkshelf/api.rb
index 840c9c8..bfbe1c5 100644
--- a/lib/berkshelf/api.rb
+++ b/lib/berkshelf/api.rb
@@ -8,6 +8,8 @@ require_relative 'api/core_ext'
module Berkshelf
module API
+ Encoding.default_external = Encoding::UTF_8
+
USER_AGENT = "Berkshelf API v#{Berkshelf::API::VERSION}".freeze
require_relative 'api/errors'
diff --git a/lib/berkshelf/api/version.rb b/lib/berkshelf/api/version.rb
index 852aaa0..4934f2a 100644
--- a/lib/berkshelf/api/version.rb
+++ b/lib/berkshelf/api/version.rb
@@ -1,5 +1,5 @@
module Berkshelf
module API
- VERSION = "2.1.3"
+ VERSION = "2.2.0"
end
end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index d8644cb..be454df 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -17,7 +17,6 @@ Spork.prefork do
end
config.mock_with :rspec
- config.treat_symbols_as_metadata_keys_with_true_values = true
config.filter_run focus: true
config.run_all_when_everything_filtered = true
diff --git a/spec/unit/berkshelf/api/cache_builder/worker/github_spec.rb b/spec/unit/berkshelf/api/cache_builder/worker/github_spec.rb
index 90c5d38..65af1d0 100644
--- a/spec/unit/berkshelf/api/cache_builder/worker/github_spec.rb
+++ b/spec/unit/berkshelf/api/cache_builder/worker/github_spec.rb
@@ -44,7 +44,7 @@ describe Berkshelf::API::CacheBuilder::Worker::Github do
end
subject do
- expect(Octokit::Client).to receive(:new) { connection }
+ expect(Octokit::Client).to receive(:new).and_return(connection)
described_class.new(organization: "opscode-cookbooks", access_token: "asdf")
end
diff --git a/spec/unit/berkshelf/api/cache_builder_spec.rb b/spec/unit/berkshelf/api/cache_builder_spec.rb
index 407e18d..52321f1 100644
--- a/spec/unit/berkshelf/api/cache_builder_spec.rb
+++ b/spec/unit/berkshelf/api/cache_builder_spec.rb
@@ -67,8 +67,8 @@ describe Berkshelf::API::CacheBuilder do
end
before do
- Berkshelf::API::Application.config.stub(:endpoints).and_return(endpoint_array)
- Berkshelf::API::CacheBuilder::Worker.stub(:[]).and_return(dummy_endpoint_klass, dummy_endpoint_klass)
+ allow(Berkshelf::API::Application.config).to receive(:endpoints).and_return(endpoint_array)
+ allow(Berkshelf::API::CacheBuilder::Worker).to receive(:[]).and_return(dummy_endpoint_klass, dummy_endpoint_klass)
end
it "has two workers" do
diff --git a/spec/unit/berkshelf/api/cache_manager_spec.rb b/spec/unit/berkshelf/api/cache_manager_spec.rb
index 01b0e1e..26eb794 100644
--- a/spec/unit/berkshelf/api/cache_manager_spec.rb
+++ b/spec/unit/berkshelf/api/cache_manager_spec.rb
@@ -12,21 +12,23 @@ describe Berkshelf::API::CacheManager do
context "when a save file exists" do
before do
@tempfile = Tempfile.new('berkshelf-api-rspec')
- described_class.stub(:cache_file) { @tempfile.path }
+ allow(described_class).to receive(:cache_file) { @tempfile.path }
end
after { @tempfile.close(true) }
it "loads the saved cache" do
- described_class.any_instance.should_receive(:load_save)
+ expect_any_instance_of(described_class).to receive(:load_save)
subject
end
end
context "when a save file does not exist" do
- before { described_class.stub(cache_file: tmp_path.join('does_not_exist').to_s) }
+ before do
+ allow(described_class).to receive(:cache_file).and_return(tmp_path.join('does_not_exist').to_s)
+ end
it "skips loading of the saved cache" do
- described_class.any_instance.should_not_receive(:load_save)
+ expect_any_instance_of(described_class).not_to receive(:load_save)
subject
end
end
diff --git a/spec/unit/berkshelf/api/endpoint/v1_spec.rb b/spec/unit/berkshelf/api/endpoint/v1_spec.rb
index c014017..be133fb 100644
--- a/spec/unit/berkshelf/api/endpoint/v1_spec.rb
+++ b/spec/unit/berkshelf/api/endpoint/v1_spec.rb
@@ -74,8 +74,8 @@ describe Berkshelf::API::Endpoint::V1 do
describe "GET /status" do
before do
- Berkshelf::API::Application.stub(:start_time) { Time.at(0) }
- Time.stub(:now) { Time.at(100) }
+ allow(Berkshelf::API::Application).to receive(:start_time) { Time.at(0) }
+ allow(Time).to receive(:now) { Time.at(100) }
get '/status'
end
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/berkshelf-api.git
More information about the Pkg-ruby-extras-commits
mailing list