berkshelf 5.6.2 → 5.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47a59c2c21cfe29b8a2e5ac9d53c4f2d7cb77f9b
-  data.tar.gz: d7e682320f8fff270382f32e43c8cb6cb08b2d7e
+  metadata.gz: ff1504161410f0f7f535a2d3c1227e66596d0e85
+  data.tar.gz: b0ee0d0640c9f5c3025b8cb26c694e9e3941bf91
 SHA512:
-  metadata.gz: 9f6c34b75dcf2aef06785aa2877455a42e1eb1c52cc5f6d4e4f6879e01572529d90a916d7fb001b1f9f05144845f130cfbedfd7f26f897740e35e9b6b1540ea1
-  data.tar.gz: 2317c1a4d03ebad201814fb0ff1bc669ac0f9ce1b48db5f3c5a19897112dcc97dec872e9205cf4efd4f2d5125572348973a512722ca7a317d6167bedebac28f1
+  metadata.gz: 11617a70da55c976441d47ce96baf8e89a4ed2f3edb88c9e102dafda4be9338953518d7b5e6fadb50e1e91094f28cc65ed4b52c702557c4c9300b15e4bc698a1
+  data.tar.gz: 92662654355e09f0537a46a00a96f8de7a39d9f127ee97b94ce86f734811513ce8db0dbc76681a00ef9ca79a5a0cf0cac8a3f39cbcf627826a01ac79211cab06

data/.travis.yml

@@ -44,23 +44,23 @@ matrix:
     - rvm: 2.3.1
       before_install:
         rm Gemfile.lock
-#    - rvm: 2.2.5
-#      before_install:
-#        # Failures in the berkshelf-api gemspec were happening with bundler 1.8
-#        - gem install bundler --version=1.10.6
-#        # Needed until https://github.com/travis-ci/apt-package-whitelist/pull/1820 is merged
-#        - sudo apt-get update
-#        - sudo apt-get -y install squid3
-#      sudo: required
-#      env:
-#        - PROXY_TESTS_DIR=/tmp/proxy_tests
-#        - PROXY_TESTS_REPO=$PROXY_TESTS_DIR/repo
-#        - rvmsudo_secure_path=1
-#      script:
-#        - git clone https://github.com/chef/proxy_tests.git
-#        - cd proxy_tests && chef-client -z -o proxy_tests::render && cd ..
-#        - rvmsudo -E bundle exec bash $PROXY_TESTS_DIR/run_tests.sh berkshelf \* \* /tmp/out.txt
-#      after_script: cat /tmp/out.txt
+    - rvm: 2.2.5
+      before_install:
+        # Failures in the berkshelf-api gemspec were happening with bundler 1.8
+        - gem install bundler --version=1.10.6
+        # Needed until https://github.com/travis-ci/apt-package-whitelist/pull/1820 is merged
+        - sudo apt-get update
+        - sudo apt-get -y install squid3
+      sudo: required
+      env:
+        - PROXY_TESTS_DIR=/tmp/proxy_tests
+        - PROXY_TESTS_REPO=$PROXY_TESTS_DIR/repo
+        - rvmsudo_secure_path=1
+      script:
+        - git clone https://github.com/chef/proxy_tests.git
+        - cd proxy_tests && chef-client -z -o proxy_tests::render && cd ..
+        - rvmsudo -E bundle exec bash $PROXY_TESTS_DIR/run_tests.sh berkshelf \* \* /tmp/out.txt
+      after_script: cat /tmp/out.txt
   allow_failures:
     - rvm: ruby-head
 

data/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Change Log
 
+## [5.6.3](https://github.com/berkshelf/berkshelf/tree/5.6.3) (2017-02-23)
+[Full Changelog](https://github.com/berkshelf/berkshelf/compare/v5.6.2...5.6.3)
+
+**Merged pull requests:**
+
+- Specify appropriate proxies based on URI [\#1679](https://github.com/berkshelf/berkshelf/pull/1679) ([tduffield](https://github.com/tduffield))
+- Remove spork [\#1672](https://github.com/berkshelf/berkshelf/pull/1672) ([biinari](https://github.com/biinari))
+
+## [v5.6.2](https://github.com/berkshelf/berkshelf/tree/v5.6.2) (2017-02-05)
+[Full Changelog](https://github.com/berkshelf/berkshelf/compare/v5.6.1...v5.6.2)
+
+**Merged pull requests:**
+
+- fix for including hashie versions before the logger appeared [\#1675](https://github.com/berkshelf/berkshelf/pull/1675) ([lamont-granquist](https://github.com/lamont-granquist))
+
 ## [v5.6.1](https://github.com/berkshelf/berkshelf/tree/v5.6.1) (2017-02-03)
 [Full Changelog](https://github.com/berkshelf/berkshelf/compare/v5.6.0...v5.6.1)
 
@@ -1396,4 +1411,4 @@
 
 
 
-\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

data/Gemfile

@@ -11,23 +11,22 @@ group :guard do
   gem "guard"
   gem "guard-cucumber"
   gem "guard-rspec"
-  gem "guard-spork"
 
   require "rbconfig"
 
-  if RbConfig::CONFIG["target_os"] =~ /darwin/i
+  install_if -> { RbConfig::CONFIG["target_os"] =~ /darwin/i } do
     gem "growl", require: false
     gem "rb-fsevent", require: false
 
-    if `uname`.strip == "Darwin" && `sw_vers -productVersion`.strip >= "10.8"
+    install_if -> { `uname`.strip == "Darwin" && `sw_vers -productVersion`.strip >= "10.8" } do
       gem "terminal-notifier-guard", "~> 1.5.3", require: false
     end rescue Errno::ENOENT
-
-  elsif RbConfig::CONFIG["target_os"] =~ /linux/i
+  end
+  install_if -> {RbConfig::CONFIG["target_os"] =~ /linux/i } do
     gem "libnotify",  "~> 0.8.0", require: false
     gem "rb-inotify", require: false
-
-  elsif RbConfig::CONFIG["target_os"] =~ /mswin|mingw/i
+  end
+  install_if -> { RbConfig::CONFIG["target_os"] =~ /mswin|mingw/i } do
     gem "rb-notifu", ">= 0.0.4", require: false
     gem "wdm", require: false
     gem "win32console", require: false
@@ -46,7 +45,6 @@ group :development do
   gem "dep_selector",  ">= 1.0"
   gem "fuubar",        ">= 2.0"
   gem "rspec",         ">= 3.0"
-  gem "spork",         ">= 0.9"
   gem "test-kitchen",  ">= 1.2"
   gem "webmock",       ">= 1.11"
   gem "yard",          ">= 0.8"

data/Gemfile.lock

@@ -20,7 +20,7 @@ GIT
 PATH
   remote: .
   specs:
-    berkshelf (5.6.2)
+    berkshelf (5.6.3)
       addressable (~> 2.3, >= 2.3.4)
       berkshelf-api-client (>= 2.0.2, < 4.0)
       buff-config (~> 2.0)
@@ -80,7 +80,7 @@ GEM
     celluloid-io (0.16.2)
       celluloid (>= 0.16.0)
       nio4r (>= 1.1.0)
-    chef-config (12.18.31)
+    chef-config (12.19.33)
       addressable
       fuzzyurl
       mixlib-config (~> 2.0)
@@ -177,13 +177,8 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    guard-spork (2.1.0)
-      childprocess (>= 0.2.3)
-      guard (~> 2.0)
-      guard-compat (~> 1.0)
-      spork (>= 0.8.4)
     hashdiff (0.3.2)
-    hashie (3.5.1)
+    hashie (3.5.4)
     hitimes (1.2.4)
     http (2.2.0)
       addressable (~> 2.3)
@@ -198,6 +193,8 @@ GEM
     i18n (0.8.0)
     ice_nine (0.11.2)
     json (1.8.6)
+    libnotify (0.8.4)
+      ffi (>= 1.0.11)
     libyajl2 (1.2.0)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
@@ -205,7 +202,7 @@ GEM
       ruby_dep (~> 1.2)
     lumberjack (1.0.11)
     method_source (0.8.2)
-    minitar (0.5.4)
+    minitar (0.6.1)
     minitest (5.10.1)
     mixlib-archive (0.4.1)
       mixlib-log
@@ -220,7 +217,7 @@ GEM
     mixlib-log (1.7.1)
     mixlib-shellout (2.2.7)
     mixlib-versioning (1.1.0)
-    molinillo (0.5.5)
+    molinillo (0.5.6)
     msgpack (1.0.3)
     multi_json (1.12.1)
     multi_test (0.1.2)
@@ -255,6 +252,7 @@ GEM
     rb-fsevent (0.9.8)
     rb-inotify (0.9.8)
       ffi (>= 0.5.0)
+    rb-notifu (0.0.4)
     reel (0.6.1)
       celluloid (>= 0.15.1)
       celluloid-io (>= 0.15.0)
@@ -306,7 +304,7 @@ GEM
     solve (3.1.0)
       molinillo (>= 0.5)
       semverse (>= 1.1, < 3.0)
-    spork (0.9.2)
+    terminal-notifier-guard (1.5.3)
     test-kitchen (1.15.0)
       mixlib-install (>= 1.2, < 3.0)
       mixlib-shellout (>= 1.2, < 3.0)
@@ -335,6 +333,7 @@ GEM
       coercible (~> 1.0)
       descendants_tracker (~> 0.0, >= 0.0.3)
       equalizer (~> 0.0, >= 0.0.9)
+    wdm (0.1.1)
     webmock (2.3.2)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
@@ -342,6 +341,7 @@ GEM
     websocket-driver (0.6.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.2)
+    win32console (1.3.2)
     yard (0.9.8)
 
 PLATFORMS
@@ -361,15 +361,19 @@ DEPENDENCIES
   guard
   guard-cucumber
   guard-rspec
-  guard-spork
   http (>= 0.9.8)
+  libnotify (~> 0.8.0)
   rake (>= 10.1)
   rb-fsevent
+  rb-inotify
+  rb-notifu (>= 0.0.4)
   rspec (>= 3.0)
-  spork (>= 0.9)
+  terminal-notifier-guard (~> 1.5.3)
   test-kitchen (>= 1.2)
+  wdm
   webmock (>= 1.11)
+  win32console
   yard (>= 0.8)
 
 BUNDLED WITH
-   1.14.2
+   1.14.3

data/Guardfile

@@ -1,20 +1,15 @@
-guard "spork" do
-  watch("Gemfile")
-  watch("spec/spec_helper.rb")  { :rspec }
-  watch(%r{^features/support/}) { :cucumber }
-end
-
-rspec_cli = "--color --drb --format Fuubar"
-rspec_cli += " --tag ~@api_client --tag ~@not_supported_on_windows" if RUBY_PLATFORM =~ /mswin|mingw|windows/
-guard "rspec", cli: rspec_cli, all_on_start: false, all_after_pass: false do
+rspec_cmd = "rspec"
+rspec_cmd += " --color --format Fuubar"
+rspec_cmd += " --tag ~@api_client --tag ~@not_supported_on_windows" if RUBY_PLATFORM =~ /mswin|mingw|windows/
+guard "rspec", cmd: rspec_cmd, all_on_start: false, all_after_pass: false do
   watch(%r{^spec/unit/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})          { |m| "spec/unit/#{m[1]}_spec.rb" }
   watch("spec/spec_helper.rb")       { "spec" }
 end
 
-cucumber_cli = "--drb --format pretty --tags ~@no_run --tags ~@wip"
-cucumber_cli += " --tags ~@spawn --tags ~@api_server" if RUBY_PLATFORM =~ /mswin|mingw|windows/
-guard "cucumber", cli: cucumber_cli, all_on_start: false, all_after_pass: false do
+cucumber_args = "--format pretty --tags ~@no_run --tags ~@wip"
+cucumber_args += " --tags ~@spawn --tags ~@api_server" if RUBY_PLATFORM =~ /mswin|mingw|windows/
+guard "cucumber", cmd_additional_args: cucumber_args, all_on_start: false, all_after_pass: false do
   watch(%r{^features/.+\.feature$})
   watch(%r{^features/support/.+$})                      { "features" }
   watch(%r{^features/step_definitions/(.+)_steps\.rb$}) { |m| Dir[File.join("**/#{m[1]}.feature")][0] || "features" }

data/features/support/env.rb

@@ -1,82 +1,76 @@
-require "spork"
-
 def windows?
   !!(RUBY_PLATFORM =~ /mswin|mingw|windows/)
 end
 
-Spork.prefork do
-  require "aruba/cucumber"
-  require "aruba/in_process"
-  require "aruba/spawn_process"
-  require "cucumber/rspec/doubles"
-  require "berkshelf/api/rspec" unless windows?
-  require "berkshelf/api/cucumber" unless windows?
-
-  Dir["spec/support/**/*.rb"].each { |f| require File.expand_path(f) }
-
-  World(Berkshelf::RSpec::PathHelpers)
-  World(Berkshelf::RSpec::Kitchen)
-
-  CHEF_SERVER_PORT = 26310
-  BERKS_API_PORT   = 26210
-
-  at_exit do
-    Berkshelf::RSpec::ChefServer.stop
-    Berkshelf::API::RSpec::Server.stop unless windows?
-  end
-
-  Before do
-
-    # Legacy ENV variables until we can move over to all InProcess
-    Berkshelf.instance_variable_set(:@berkshelf_path, nil)
-    ENV["BERKSHELF_PATH"] = berkshelf_path.to_s
-    ENV["BERKSHELF_CONFIG"] = Berkshelf.config.path.to_s
-    ENV["BERKSHELF_CHEF_CONFIG"] = chef_config_path.to_s
-
-    aruba.config.command_launcher = :in_process
-    aruba.config.main_class = Berkshelf::Cli::Runner
-    @dirs = ["spec/tmp/aruba"] # set aruba's temporary directory
-
-    stub_kitchen!
-    clean_tmp_path
-    Berkshelf.initialize_filesystem
-    Berkshelf::CookbookStore.instance.initialize_filesystem
-    reload_configs
-    Berkshelf::CachedCookbook.instance_variable_set(:@loaded_cookbooks, nil)
-
-    endpoints = [
-      {
-        type: "chef_server",
-        options: {
-          url: "http://localhost:#{CHEF_SERVER_PORT}",
-          client_name: "reset",
-          client_key: File.expand_path("spec/config/berkshelf.pem"),
-        },
-      },
-    ]
+require "aruba/cucumber"
+require "aruba/in_process"
+require "aruba/spawn_process"
+require "cucumber/rspec/doubles"
+require "berkshelf/api/rspec" unless windows?
+require "berkshelf/api/cucumber" unless windows?
+
+Dir["spec/support/**/*.rb"].each { |f| require File.expand_path(f) }
+
+World(Berkshelf::RSpec::PathHelpers)
+World(Berkshelf::RSpec::Kitchen)
+
+CHEF_SERVER_PORT = 26310
+BERKS_API_PORT   = 26210
 
-    Berkshelf::RSpec::ChefServer.start(port: CHEF_SERVER_PORT)
-    Berkshelf::API::RSpec::Server.start(port: BERKS_API_PORT, endpoints: endpoints) unless windows?
+at_exit do
+  Berkshelf::RSpec::ChefServer.stop
+  Berkshelf::API::RSpec::Server.stop unless windows?
+end
 
-    aruba.config.io_wait_timeout = Cucumber::JRUBY ? 7 : 5
-    @aruba_timeout_seconds = Cucumber::JRUBY ? 35 : 15
-  end
+Before do
+
+  # Legacy ENV variables until we can move over to all InProcess
+  Berkshelf.instance_variable_set(:@berkshelf_path, nil)
+  ENV["BERKSHELF_PATH"] = berkshelf_path.to_s
+  ENV["BERKSHELF_CONFIG"] = Berkshelf.config.path.to_s
+  ENV["BERKSHELF_CHEF_CONFIG"] = chef_config_path.to_s
+
+  aruba.config.command_launcher = :in_process
+  aruba.config.main_class = Berkshelf::Cli::Runner
+  @dirs = ["spec/tmp/aruba"] # set aruba's temporary directory
+
+  stub_kitchen!
+  clean_tmp_path
+  Berkshelf.initialize_filesystem
+  Berkshelf::CookbookStore.instance.initialize_filesystem
+  reload_configs
+  Berkshelf::CachedCookbook.instance_variable_set(:@loaded_cookbooks, nil)
+
+  endpoints = [
+    {
+      type: "chef_server",
+      options: {
+        url: "http://localhost:#{CHEF_SERVER_PORT}",
+        client_name: "reset",
+        client_key: File.expand_path("spec/config/berkshelf.pem"),
+      },
+    },
+  ]
 
-  Before("@spawn") do
-    aruba.config.command_launcher = :spawn
+  Berkshelf::RSpec::ChefServer.start(port: CHEF_SERVER_PORT)
+  Berkshelf::API::RSpec::Server.start(port: BERKS_API_PORT, endpoints: endpoints) unless windows?
 
-    Berkshelf.instance_variable_set(:@berkshelf_path, nil)
-    set_environment_variable("BERKSHELF_PATH", berkshelf_path.to_s)
-    set_environment_variable("BERKSHELF_CONFIG", Berkshelf.config.path.to_s)
-    set_environment_variable("BERKSHELF_CHEF_CONFIG", chef_config_path.to_s)
-  end
+  aruba.config.io_wait_timeout = Cucumber::JRUBY ? 7 : 5
+  @aruba_timeout_seconds = Cucumber::JRUBY ? 35 : 15
+end
 
-  Before("@slow_process") do
-    aruba.config.io_wait_timeout = Cucumber::JRUBY ? 70 : 30
-    @aruba_timeout_seconds = Cucumber::JRUBY ? 140 : 60
-  end
+Before("@spawn") do
+  aruba.config.command_launcher = :spawn
+
+  Berkshelf.instance_variable_set(:@berkshelf_path, nil)
+  set_environment_variable("BERKSHELF_PATH", berkshelf_path.to_s)
+  set_environment_variable("BERKSHELF_CONFIG", Berkshelf.config.path.to_s)
+  set_environment_variable("BERKSHELF_CHEF_CONFIG", chef_config_path.to_s)
 end
 
-Spork.each_run do
-  require "berkshelf/cli"
+Before("@slow_process") do
+  aruba.config.io_wait_timeout = Cucumber::JRUBY ? 70 : 30
+  @aruba_timeout_seconds = Cucumber::JRUBY ? 140 : 60
 end
+
+require "berkshelf/cli"

data/lib/berkshelf/community_rest.rb

@@ -180,7 +180,7 @@ module Berkshelf
       local.binmode
 
       Retryable.retryable(tries: retries, on: OpenURI::HTTPError, sleep: retry_interval) do
-        open(target, "rb", open_uri_options) do |remote|
+        open(target, "rb", open_uri_options(target)) do |remote|
           local.write(remote.read)
         end
       end
@@ -192,11 +192,12 @@ module Berkshelf
 
     private
 
-    def open_uri_options
+    def open_uri_options(target)
       options = {}
       options.merge!(headers)
       options.merge!(open_uri_proxy_options)
       options.merge!(ssl_verify_mode: ssl_verify_mode)
+      options.merge!(proxy: URI.parse(target).find_proxy())
     end
 
     def open_uri_proxy_options

data/lib/berkshelf/version.rb

@@ -1,3 +1,3 @@
 module Berkshelf
-  VERSION = "5.6.2"
+  VERSION = "5.6.3"
 end

data/spec/spec_helper.rb

@@ -1,89 +1,83 @@
-require "spork"
-
 def windows?
   !!(RUBY_PLATFORM =~ /mswin|mingw|windows/)
 end
 
 BERKS_SPEC_DATA = File.expand_path("../data", __FILE__)
 
-Spork.prefork do
-  require "rspec"
-  require "cleanroom/rspec"
-  require "webmock/rspec"
-  require "berkshelf/api/rspec" unless windows?
+require "rspec"
+require "cleanroom/rspec"
+require "webmock/rspec"
+require "berkshelf/api/rspec" unless windows?
 
-  Dir["spec/support/**/*.rb"].each { |f| require File.expand_path(f) }
+Dir["spec/support/**/*.rb"].each { |f| require File.expand_path(f) }
 
-  RSpec.configure do |config|
-    config.include Berkshelf::RSpec::FileSystemMatchers
-    config.include Berkshelf::RSpec::ChefAPI
-    config.include Berkshelf::RSpec::ChefServer
-    config.include Berkshelf::RSpec::Git
-    config.include Berkshelf::RSpec::PathHelpers
-    config.include Berkshelf::API::RSpec unless windows?
+RSpec.configure do |config|
+  config.include Berkshelf::RSpec::FileSystemMatchers
+  config.include Berkshelf::RSpec::ChefAPI
+  config.include Berkshelf::RSpec::ChefServer
+  config.include Berkshelf::RSpec::Git
+  config.include Berkshelf::RSpec::PathHelpers
+  config.include Berkshelf::API::RSpec unless windows?
 
-    config.expect_with :rspec do |c|
-      c.syntax = :expect
-    end
+  config.expect_with :rspec do |c|
+    c.syntax = :expect
+  end
 
-    config.mock_with :rspec
-    config.filter_run focus: true
-    config.filter_run_excluding not_supported_on_windows: windows?
-    config.run_all_when_everything_filtered = true
+  config.mock_with :rspec
+  config.filter_run focus: true
+  config.filter_run_excluding not_supported_on_windows: windows?
+  config.run_all_when_everything_filtered = true
 
-    config.before(:each) do
-      Berkshelf.logger = Berkshelf::Logger.new(nil)
-      Berkshelf.set_format(:null)
-      Berkshelf.ui.mute!
-    end
-
-    config.before(:suite) do
-      WebMock.disable_net_connect!(allow_localhost: true, net_http_connect_on_start: true)
-      Berkshelf::RSpec::ChefServer.start
-      Berkshelf::API::RSpec::Server.start unless windows?
-    end
+  config.before(:each) do
+    Berkshelf.logger = Berkshelf::Logger.new(nil)
+    Berkshelf.set_format(:null)
+    Berkshelf.ui.mute!
+  end
 
-    config.before(:all) do
-      ENV["BERKSHELF_PATH"] = berkshelf_path.to_s
-    end
+  config.before(:suite) do
+    WebMock.disable_net_connect!(allow_localhost: true, net_http_connect_on_start: true)
+    Berkshelf::RSpec::ChefServer.start
+    Berkshelf::API::RSpec::Server.start unless windows?
+  end
 
-    config.before(:each) do
-      Berkshelf::API::RSpec::Server.clear_cache unless windows?
-      clean_tmp_path
-      Berkshelf.initialize_filesystem
-      Berkshelf::CookbookStore.instance.initialize_filesystem
-      reload_configs
-    end
+  config.before(:all) do
+    ENV["BERKSHELF_PATH"] = berkshelf_path.to_s
   end
 
-  def capture(stream)
-    begin
-      stream = stream.to_s
-      eval "$#{stream} = StringIO.new"
-      yield
-      result = eval("$#{stream}").string
-    ensure
-      eval("$#{stream} = #{stream.upcase}")
-    end
+  config.before(:each) do
+    Berkshelf::API::RSpec::Server.clear_cache unless windows?
+    clean_tmp_path
+    Berkshelf.initialize_filesystem
+    Berkshelf::CookbookStore.instance.initialize_filesystem
+    reload_configs
+  end
+end
 
-    result
+def capture(stream)
+  begin
+    stream = stream.to_s
+    eval "$#{stream} = StringIO.new"
+    yield
+    result = eval("$#{stream}").string
+  ensure
+    eval("$#{stream} = #{stream.upcase}")
   end
+
+  result
 end
 
-Spork.each_run do
-  require "berkshelf"
+require "berkshelf"
 
-  module Berkshelf
-    class GitLocation
-      include Berkshelf::RSpec::Git
+module Berkshelf
+  class GitLocation
+    include Berkshelf::RSpec::Git
 
-      alias :real_clone :clone
-      def clone
-        fake_remote = generate_fake_git_remote(uri, tags: @branch ? [@branch] : [])
-        tmp_clone = File.join(self.class.tmpdir, uri.gsub(/[\/:]/, "-"))
-        @uri = "file://#{fake_remote}"
-        real_clone
-      end
+    alias :real_clone :clone
+    def clone
+      fake_remote = generate_fake_git_remote(uri, tags: @branch ? [@branch] : [])
+      tmp_clone = File.join(self.class.tmpdir, uri.gsub(/[\/:]/, "-"))
+      @uri = "file://#{fake_remote}"
+      real_clone
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 5.6.2
+  version: 5.6.3
 platform: ruby
 authors:
 - Jamie Winsor
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-05 00:00:00.000000000 Z
+date: 2017-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -479,7 +479,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.9
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Manages a Cookbook's, or an Application's, Cookbook dependencies