berkshelf 4.2.3 → 4.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7345bd7238f0a925cf62cbb11807c7cd142600e
-  data.tar.gz: 61132c583ec7e16c13abb2e1fd52b4a5c1f7a6fd
+  metadata.gz: 60e6cdaa1d8b9ad27930fe18d63bd29b31f00900
+  data.tar.gz: fea441fd4958e380dbbe3f5cef0bddee5c9a181e
 SHA512:
-  metadata.gz: 0cf077f6171d5e0d75dfac75b290aeac2c6a8e2b1c8532b38438eebc1908e805977e6cbf58b3d4180dc5244c2e1142a628388e592bd8cb81b0cef92f0324849c
-  data.tar.gz: 31f8bc15dcb788600ca9b0a64a75c6b3bf220d8b4e6cbfff5bb9504fff1a4f63adb1603df53e57bb03f4fd3709430a614dfde1fdc80f57cd509289daab317e8e
+  metadata.gz: bdc0cfe2fd46f560cebc048502191d61344450577f7e8cd64bb424138e15850bee7cd7b63e94fccc6645f994bd0b01732446311df42fc1b0e44e14a7a095a21d
+  data.tar.gz: 9a6fd4209812da35aa820a2e2a7ef14c8486cc19b4f8bb343bdac5323040787e46d07565b5560c61260e56caa4bd3d42ed88dc3e244f98d4410527631e2b86dc

data/.travis.yml

@@ -28,7 +28,7 @@ notifications:
 branches:
   only:
     - master
-bundler_args: --without guard --jobs 7
+bundler_args: --without guard changelog --jobs 7
 before_install:
   - gem update --system
   - gem install bundler

data/Gemfile

@@ -30,6 +30,10 @@ group :guard do
   end
 end
 
+group :changelog do
+  gem 'github_changelog_generator', "1.11.3"
+end
+
 group :test do
   gem "berkshelf-api", git: "https://github.com/berkshelf/berkshelf-api.git"
 end

data/Gemfile.lock

@@ -19,9 +19,9 @@ GIT
 PATH
   remote: .
   specs:
-    berkshelf (4.2.3)
+    berkshelf (4.3.0)
       addressable (~> 2.3, >= 2.3.4)
-      berkshelf-api-client (~> 2.0)
+      berkshelf-api-client (~> 2.0, >= 2.0.2)
       buff-config (~> 1.0)
       buff-extensions (~> 1.0)
       buff-shell_out (~> 0.1)
@@ -33,20 +33,20 @@ PATH
       minitar (~> 0.5, >= 0.5.4)
       octokit (~> 4.0)
       retryable (~> 2.0)
-      ridley (~> 4.4, >= 4.4.3)
+      ridley (~> 4.5)
       solve (~> 2.0)
       thor (~> 0.19)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.5.1)
+    activesupport (4.2.6)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.3.8)
+    addressable (2.4.0)
     archive (0.0.6)
       ffi (~> 1.9.3)
     aruba (0.10.2)
@@ -61,9 +61,10 @@ GEM
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
-    berkshelf-api-client (2.0.1)
+    berkshelf-api-client (2.0.2)
       faraday (~> 0.9.1)
       httpclient (~> 2.7.0)
+      ridley (~> 4.5)
     buff-config (1.0.1)
       buff-extensions (~> 1.0)
       varia_model (~> 0.4)
@@ -123,6 +124,7 @@ GEM
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
     ffi (1.9.10)
+    ffi (1.9.10-x86-mingw32)
     ffi-yajl (2.2.3)
       libyajl2 (~> 1.2)
     formatador (0.2.5)
@@ -130,13 +132,12 @@ GEM
       rspec (~> 3.0)
       ruby-progressbar (~> 1.4)
     gherkin (3.2.0)
-    github_api (0.13.0)
-      addressable (~> 2.3)
+    github_api (0.13.1)
+      addressable (~> 2.4.0)
       descendants_tracker (~> 0.0.4)
       faraday (~> 0.8, < 0.10)
       hashie (>= 3.4)
       multi_json (>= 1.7.5, < 2.0)
-      nokogiri (~> 1.6.6)
       oauth2
     github_changelog_generator (1.11.3)
       bundler (>= 1.7)
@@ -180,6 +181,7 @@ GEM
     hashdiff (0.3.0)
     hashie (3.4.3)
     hitimes (1.2.3)
+    hitimes (1.2.3-x86-mingw32)
     http (0.9.8)
       addressable (~> 2.3)
       http-cookie (~> 1.0)
@@ -202,7 +204,6 @@ GEM
       rb-kqueue (>= 0.2)
     lumberjack (1.0.10)
     method_source (0.8.2)
-    mini_portile2 (2.0.0)
     minitar (0.5.4)
     minitest (5.8.4)
     mixlib-authentication (1.4.0)
@@ -214,8 +215,12 @@ GEM
     mixlib-install (0.7.1)
     mixlib-log (1.6.0)
     mixlib-shellout (2.2.6)
+    mixlib-shellout (2.2.6-universal-mingw32)
+      win32-process (~> 0.8.2)
+      wmi-lite (~> 1.0)
     molinillo (0.2.3)
     msgpack (0.5.12)
+    msgpack (0.5.12-x86-mingw32)
     multi_json (1.11.2)
     multi_test (0.1.2)
     multi_xml (0.5.5)
@@ -225,16 +230,14 @@ GEM
       net-ssh (>= 2.6.5)
     net-ssh (3.0.2)
     nio4r (1.2.1)
-    nokogiri (1.6.7.2)
-      mini_portile2 (~> 2.0.0.rc2)
     oauth2 (1.1.0)
       faraday (>= 0.8, < 0.10)
       jwt (~> 1.0, < 1.5.2)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    octokit (4.0.0)
-      sawyer (~> 0.6.0, >= 0.5.3)
+    octokit (4.3.0)
+      sawyer (~> 0.7.0, >= 0.5.3)
     overcommit (0.32.0)
       childprocess (~> 0.5.8)
       iniparse (~> 1.4)
@@ -265,7 +268,7 @@ GEM
       rack
       websocket-driver (>= 0.5.1)
     retryable (2.0.3)
-    ridley (4.4.3)
+    ridley (4.5.0)
       addressable
       buff-config (~> 1.0)
       buff-extensions (~> 1.0)
@@ -304,8 +307,8 @@ GEM
       unicode-display_width (~> 0.3)
     ruby-progressbar (1.7.5)
     safe_yaml (1.0.4)
-    sawyer (0.6.0)
-      addressable (~> 2.3.5)
+    sawyer (0.7.0)
+      addressable (>= 2.3.5, < 2.5)
       faraday (~> 0.8, < 0.10)
     semverse (1.2.1)
     slop (3.6.0)
@@ -313,8 +316,7 @@ GEM
       molinillo (~> 0.2.3)
       semverse (~> 1.1)
     spork (0.9.2)
-    test-kitchen (1.5.0)
-      chef-config (>= 12.5.1)
+    test-kitchen (1.6.0)
       mixlib-install (~> 0.7)
       mixlib-shellout (>= 1.2, < 3.0)
       net-scp (~> 1.1)
@@ -330,6 +332,7 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.2)
+    unf_ext (0.0.7.2-x86-mingw32)
     unicode-display_width (0.3.1)
     uuidtools (2.1.5)
     varia_model (0.4.1)
@@ -340,17 +343,21 @@ GEM
       coercible (~> 1.0)
       descendants_tracker (~> 0.0, >= 0.0.3)
       equalizer (~> 0.0, >= 0.0.9)
-    webmock (1.24.1)
+    webmock (1.24.2)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
     websocket-driver (0.6.3)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.2)
+    win32-process (0.8.3)
+      ffi (>= 1.0.0)
+    wmi-lite (1.0.0)
     yard (0.8.7.6)
 
 PLATFORMS
   ruby
+  x86-mingw32
 
 DEPENDENCIES
   aruba (~> 0.10.0)

data/berkshelf.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = '>= 1.8.0'
 
   s.add_dependency 'addressable',          '~> 2.3', '>= 2.3.4'
-  s.add_dependency 'berkshelf-api-client', '~> 2.0'
+  s.add_dependency 'berkshelf-api-client', '~> 2.0', '>= 2.0.2'
   s.add_dependency 'buff-config',          '~> 1.0'
   s.add_dependency 'buff-extensions',      '~> 1.0'
   s.add_dependency 'buff-shell_out',       '~> 0.1'
@@ -40,7 +40,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'httpclient',           '~> 2.7'
   s.add_dependency 'minitar',              '~> 0.5', '>= 0.5.4'
   s.add_dependency 'retryable',            '~> 2.0'
-  s.add_dependency 'ridley',               '~> 4.4', '>= 4.4.3'
+  s.add_dependency 'ridley',               '~> 4.5'
   s.add_dependency 'solve',                '~> 2.0'
   s.add_dependency 'thor',                 '~> 0.19'
   s.add_dependency 'octokit',              '~> 4.0'
@@ -58,5 +58,4 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'webmock',       '~> 1.11'
   s.add_development_dependency 'yard',          '~> 0.8'
   s.add_development_dependency 'http',          '~> 0.9', '>= 0.9.8'
-  s.add_development_dependency 'github_changelog_generator', '1.11.3'
 end

data/features/commands/install.feature

@@ -487,11 +487,7 @@ Feature: berks install
       cookbook "doesntexist", git: "git://github.com/asdjhfkljashflkjashfakljsf"
       """
     When I run `berks install`
-    Then the output should contain:
-      """
-      Repository not found.
-      """
-      And the exit status should be "GitError"
+    Then the exit status should be "GitError"
 
   Scenario: transitive dependencies in metadata
     Given the cookbook store contains a cookbook "fake" "1.0.0" with dependencies:

data/features/json_formatter.feature

@@ -18,7 +18,7 @@ Feature: --format json
       {
         "cookbooks": [
           {
-            "api_source": "http://0.0.0.0:26210",
+            "api_source": "http://0.0.0.0:26210/",
             "location_path": "http://localhost:26310/",
             "version": "1.0.0",
             "name": "berkshelf"
@@ -149,7 +149,7 @@ Feature: --format json
           {
             "local": "0.1.0",
             "remote": {
-              "http://0.0.0.0:26210": "0.2.9"
+              "http://0.0.0.0:26210/": "0.2.9"
             },
             "name": "seth"
           }

data/lib/berkshelf/source.rb

@@ -5,15 +5,42 @@ module Berkshelf
     include Comparable
 
     # @return [Berkshelf::SourceURI]
-    attr_reader :uri
+    attr_accessor :uri
+
+    # @return [Berkshelf::APIClient]
+    attr_accessor :api_client
+
+    attr_accessor :source
 
     # @param [String, Berkshelf::SourceURI] uri
-    def initialize(uri)
-      @uri        = SourceURI.parse(uri)
-      @api_client = APIClient.new(uri, ssl: {verify: Berkshelf::Config.instance.ssl.verify})
+    def initialize(source)
+      @source = source
       @universe   = nil
     end
 
+    def api_client
+      @api_client ||= begin
+                        if source == :chef_server
+                          APIClient.chef_server(
+                            ssl: {verify: Berkshelf::Config.instance.ssl.verify},
+                            client_name: Berkshelf::Config.instance.chef.node_name,
+                            server_url: Berkshelf::Config.instance.chef.chef_server_url,
+                            client_key: Berkshelf::Config.instance.chef.client_key,
+                          )
+                        else
+                          APIClient.new(uri, ssl: {verify: Berkshelf::Config.instance.ssl.verify})
+                        end
+                      end
+    end
+
+    def uri
+      @uri ||= if source == :chef_server
+                 SourceURI.parse(Berkshelf::Config.instance.chef.chef_server_url)
+               else
+                 SourceURI.parse(source)
+               end
+    end
+
     # Forcefully obtain the universe from the API endpoint and assign it to {#universe}. This
     # will reload the value of {#universe} even if it has been loaded before.
     #
@@ -53,7 +80,7 @@ module Berkshelf
       universe
         .select { |cookbook| cookbook.name =~ Regexp.new(name) }
         .group_by(&:name)
-        .collect { |name, versions| versions.max_by { |v| Semverse::Version.new(v.version) } }
+        .collect { |_, versions| versions.max_by { |v| Semverse::Version.new(v.version) } }
     end
 
     # Determine if this source is a "default" source, as defined in the
@@ -62,7 +89,7 @@ module Berkshelf
     # @return [true, false]
     #   true if this a default source, false otherwise
     def default?
-      @default_ ||= @uri.host == URI.parse(Berksfile::DEFAULT_API_URL).host
+      @default_ ||= uri.host == URI.parse(Berksfile::DEFAULT_API_URL).host
     end
 
     # @param [String] name
@@ -96,9 +123,5 @@ module Berkshelf
       uri == other.uri
     end
 
-    private
-
-      # @return [Berkshelf::APIClient]
-      attr_reader :api_client
   end
 end

data/lib/berkshelf/version.rb

@@ -1,3 +1,3 @@
 module Berkshelf
-  VERSION = "4.2.3"
+  VERSION = "4.3.0"
 end

data/spec/unit/berkshelf/berksfile_spec.rb

@@ -163,7 +163,7 @@ describe Berkshelf::Berksfile do
       let(:invalid_uri) { ".....$1233...." }
 
       it "raises an InvalidSourceURI" do
-        expect { subject.source(invalid_uri) }.to raise_error(Berkshelf::InvalidSourceURI)
+        expect { subject.source(invalid_uri).uri }.to raise_error(Berkshelf::InvalidSourceURI)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 4.2.3
+  version: 4.3.0
 platform: ruby
 authors:
 - Jamie Winsor
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-26 00:00:00.000000000 Z
+date: 2016-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -41,6 +41,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -48,6 +51,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: buff-config
   requirement: !ruby/object:Gem::Requirement
@@ -172,20 +178,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.4.3
+        version: '4.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.4.3
+        version: '4.5'
 - !ruby/object:Gem::Dependency
   name: solve
   requirement: !ruby/object:Gem::Requirement
@@ -416,20 +416,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.8
-- !ruby/object:Gem::Dependency
-  name: github_changelog_generator
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.11.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.11.3
 description: Manages a Cookbook's, or an Application's, Cookbook dependencies
 email:
 - jamie@vialstudios.com
@@ -649,7 +635,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Manages a Cookbook's, or an Application's, Cookbook dependencies