berkshelf 1.0.0 → 1.0.2

data/lib/berkshelf.rb

@@ -83,8 +83,8 @@ module Berkshelf
     # @return [String]
     #   path to the created temporary directory
     def mktmpdir
-      FileUtils.mkdir_p(File.join(berkshelf_path, "tmp"))
-      Dir.mktmpdir(nil, File.join(berkshelf_path, "tmp"))
+      FileUtils.mkdir_p(tmp_dir)
+      Dir.mktmpdir(nil, tmp_dir)
     end
 
     def cookbooks_dir

data/lib/berkshelf/cli.rb

@@ -183,7 +183,7 @@ module Berkshelf
         client_name: Berkshelf::Config.instance.chef.node_name,
         client_key: Berkshelf::Config.instance.chef.client_key,
         ssl: {
-          verify: (options[:ssl_verify] || Berkshelf::Config.instance.ssl.verify)
+          verify: (options[:ssl_verify].nil? ? Berkshelf::Config.instance.ssl.verify : options[:ssl_verify])
         }
       )
     rescue Ridley::Errors::ClientKeyFileNotFound => e

data/lib/berkshelf/core_ext/file_utils.rb

@@ -2,34 +2,13 @@ require 'fileutils'
 
 module FileUtils
   class << self
-    alias_method :old_mv, :mv
-
-    # Override mv to ensure {safe_mv} is run if we are on the Windows platform.
+    # Override mv to avoid several bugs (Errno::EACCES in Windows, Errno::ENOENT
+    #   with relative softlinks on Linux), by forcing to copy and delete instead
     #
     # @see {FileUtils::mv}
     # @see {safe_mv}
     def mv(src, dest, options = {})
-      if windows?
-        safe_mv(src, dest, options)
-      else
-        old_mv(src, dest, options)
-      end
-    end
-
-    # If we encounter Errno::EACCES, which seems to happen occasionally on Windows,
-    # try to copy and delete the file instead of moving it.
-    #
-    # @see https://github.com/RiotGames/berkshelf/issues/140
-    # @see http://www.ruby-forum.com/topic/1044813
-    #
-    # @param [String] src
-    # @param [String] dest
-    # @param [Hash] options
-    #   @see {FileUtils::mv}
-    def safe_mv(src, dest, options = {})
-      FileUtils.old_mv(src, dest, options)
-    rescue Errno::EACCES
-      FileUtils.cp_r(src, dest)
+      FileUtils.cp_r(src, dest, options)
       FileUtils.rm_rf(src)
     end
   end

data/lib/berkshelf/git.rb

@@ -73,16 +73,8 @@ module Berkshelf
       def find_git
         git_path = nil
         ENV["PATH"].split(File::PATH_SEPARATOR).each do |path|
-          potential_path = File.join(path, 'git')
-          if File.executable?(potential_path)
-            git_path = potential_path
-            break
-          end
-          potential_path = File.join(path, 'git.exe')
-          if File.executable?(potential_path)
-            git_path = potential_path
-            break
-          end
+          git_path = detect_git_path(path)
+          break if git_path
         end
 
         unless git_path
@@ -144,6 +136,16 @@ module Berkshelf
           return arg unless HAS_SPACE_RE.match(arg)
           "\"#{arg}\""
         end
+
+        def detect_git_path(base_dir)
+          %w{ git git.exe git.cmd }.each do |git_cmd|
+            potential_path = File.join(base_dir, git_cmd)
+            if File.executable?(potential_path)
+              return potential_path
+            end
+          end
+          nil
+        end
     end
   end
 end

data/lib/berkshelf/locations/git_location.rb

@@ -1,13 +1,25 @@
 module Berkshelf
   # @author Jamie Winsor <jamie@vialstudios.com>
   class GitLocation
+    class << self
+      # Create a temporary directory for the cloned repository within Berkshelf's
+      # temporary directory
+      #
+      # @return [String]
+      #   the path to the created temporary directory
+      def tmpdir
+        @tmpdir ||= Dir.mktmpdir(Berkshelf.mktmpdir)
+      end
+    end
+
     include Location
 
     set_location_key :git
-    set_valid_options :ref, :branch, :tag
+    set_valid_options :ref, :branch, :tag, :rel
 
     attr_accessor :uri
     attr_accessor :branch
+    attr_accessor :rel
 
     alias_method :ref, :branch
     alias_method :tag, :branch
@@ -24,11 +36,14 @@ module Berkshelf
     #   same as ref
     # @option options [String] :tag
     #   same as tag
+    # @option options [String] :rel
+    #   the path within the repository to find the cookbook
     def initialize(name, version_constraint, options = {})
       @name               = name
       @version_constraint = version_constraint
       @uri                = options[:git]
       @branch             = options[:branch] || options[:ref] || options[:tag]
+      @rel                = options[:rel]
 
       Git.validate_uri!(@uri)
     end
@@ -37,22 +52,22 @@ module Berkshelf
     #
     # @return [Berkshelf::CachedCookbook]
     def download(destination)
-      tmp_clone = Dir.mktmpdir
-      ::Berkshelf::Git.clone(uri, tmp_clone)
-      ::Berkshelf::Git.checkout(tmp_clone, branch) if branch
+      ::Berkshelf::Git.checkout(clone, branch) if branch
       unless branch
-        self.branch = ::Berkshelf::Git.rev_parse(tmp_clone)
+        self.branch = ::Berkshelf::Git.rev_parse(clone)
       end
 
-      unless File.chef_cookbook?(tmp_clone)
+      tmp_path = rel ? File.join(clone, rel) : clone
+      unless File.chef_cookbook?(tmp_path)
         msg = "Cookbook '#{name}' not found at git: #{uri}"
         msg << " with branch '#{branch}'" if branch
+        msg << " at path '#{rel}'" if rel
         raise CookbookNotFound, msg
       end
 
-      cb_path = File.join(destination, "#{self.name}-#{Git.rev_parse(tmp_clone)}")
+      cb_path = File.join(destination, "#{self.name}-#{Git.rev_parse(clone)}")
       FileUtils.rm_rf(cb_path)
-      FileUtils.mv(tmp_clone, cb_path)
+      FileUtils.mv(tmp_path, cb_path)
 
       cached = CachedCookbook.from_store_path(cb_path)
       validate_cached(cached)
@@ -79,5 +94,15 @@ module Berkshelf
       def git
         @git ||= Berkshelf::Git.new(uri)
       end
+
+      def clone
+        tmp_clone = File.join(self.class.tmpdir, uri.gsub(/[\/:]/,'-'))
+
+        unless File.exists?(tmp_clone)
+          Berkshelf::Git.clone(uri, tmp_clone)
+        end
+
+        tmp_clone
+      end
   end
 end

data/lib/berkshelf/locations/github_location.rb

@@ -1,7 +1,7 @@
 module Berkshelf
   # @author Josiah Kiehl <josiah@skirmisher.net>
   class GithubLocation < GitLocation
-    DEFAULT_PROTOCOL = 'git'
+    DEFAULT_PROTOCOL = :git
 
     set_location_key :github
     set_valid_options :protocol
@@ -16,12 +16,12 @@ module Berkshelf
     #
     # @option options [String] :github
     #   the GitHub repo identifier to clone
-    # @option options [String] :protocol
+    # @option options [#to_sym] :protocol
     #   the protocol with which to communicate with GitHub
     def initialize(name, version_constraint, options = {})
       @repo_identifier = options.delete(:github)
-      @protocol = options.delete(:protocol) || DEFAULT_PROTOCOL
-      options[:git] = github_url
+      @protocol        = (options.delete(:protocol) || DEFAULT_PROTOCOL).to_sym
+      options[:git]    = github_url
       super
     end
 
@@ -32,12 +32,12 @@ module Berkshelf
     # @return [String]
     #   GitHub url
     def github_url
-      case protocol.to_s
-      when 'ssh'
+      case protocol
+      when :ssh
         "git@github.com:#{repo_identifier}.git"
-      when 'https'
+      when :https
         "https://github.com/#{repo_identifier}.git"
-      when 'git'
+      when :git
         "git://github.com/#{repo_identifier}.git"
       else
         raise UnknownGitHubProtocol.new(protocol)
@@ -46,7 +46,7 @@ module Berkshelf
 
     def to_s
       s = "#{self.class.location_key}: '#{repo_identifier}'"
-      s << " with branch: '#{branch}'"     if branch
+      s << " with branch: '#{branch}'" if branch
       s << " over protocol: '#{protocol}'" unless default_protocol?
       s
     end
@@ -54,7 +54,7 @@ module Berkshelf
     private
 
       def default_protocol?
-        @protocol == DEFAULT_PROTOCOL
+        self.protocol == DEFAULT_PROTOCOL
       end
   end
 end

data/lib/berkshelf/version.rb

@@ -1,3 +1,3 @@
 module Berkshelf
-  VERSION = "1.0.0"
+  VERSION = "1.0.2"
 end

data/spec/unit/berkshelf/core_ext/file_utils_spec.rb

@@ -6,16 +6,10 @@ describe FileUtils do
     let(:dest) { double('dest') }
     let(:options) { double('options') }
 
-    it "delegates to #safe_mv if on Windows" do
+    it "replaces mv with cp_r and rm_rf" do
       subject.stub(:windows?) { true }
-      FileUtils.should_receive(:safe_mv).with(src, dest, options)
-
-      FileUtils.mv(src, dest, options)
-    end
-
-    it "delegates to #old_mv if not on Windows" do
-      subject.stub(:windows?) { false }
-      FileUtils.should_receive(:old_mv).with(src, dest, options)
+      FileUtils.should_receive(:cp_r).with(src, dest, options)
+      FileUtils.should_receive(:rm_rf).with(src)
 
       FileUtils.mv(src, dest, options)
     end

data/spec/unit/berkshelf/git_spec.rb

@@ -1,157 +1,155 @@
 require 'spec_helper'
 
-module Berkshelf
-  describe Git do
-    describe "ClassMethods" do
-      subject { Git }
-
-      describe "::find_git" do
-        it "should find git" do
-          subject.find_git.should_not be_nil
-        end
+describe Berkshelf::Git do
+  describe "ClassMethods" do
+    subject { Berkshelf::Git }
 
-        it "should raise if it can't find git" do
-          ENV.should_receive(:[]).with("PATH").and_return(String.new)
+    describe "::find_git" do
+      it "should find git" do
+        subject.find_git.should_not be_nil
+      end
 
-          lambda {
-            subject.find_git
-          }.should raise_error(GitNotFound)
-        end
+      it "should raise if it can't find git" do
+        ENV.should_receive(:[]).with("PATH").and_return(String.new)
+
+        lambda {
+          subject.find_git
+        }.should raise_error(Berkshelf::GitNotFound)
       end
+    end
 
-      describe "::clone" do
-        let(:target) { tmp_path.join("nginx") }
+    describe "::clone" do
+      let(:target) { tmp_path.join("nginx") }
 
-        it "clones the repository to the target path" do
-          subject.clone("git://github.com/opscode-cookbooks/nginx.git", target)
+      it "clones the repository to the target path" do
+        subject.clone("git://github.com/opscode-cookbooks/nginx.git", target)
 
-          target.should exist
-          target.should be_directory
-        end
+        target.should exist
+        target.should be_directory
       end
+    end
 
-      describe "::checkout" do
-        let(:repo_path) { tmp_path.join("nginx") }
-        let(:repo) { subject.clone("git://github.com/opscode-cookbooks/nginx.git", repo_path) }
-        let(:tag) { "0.101.2" }
+    describe "::checkout" do
+      let(:repo_path) { tmp_path.join("nginx") }
+      let(:repo) { subject.clone("git://github.com/opscode-cookbooks/nginx.git", repo_path) }
+      let(:tag) { "0.101.2" }
 
-        it "checks out the specified path of the given repository" do
-          subject.checkout(repo, tag)
+      it "checks out the specified path of the given repository" do
+        subject.checkout(repo, tag)
 
-          Dir.chdir repo_path do
-            %x[git rev-parse #{tag}].should == %x[git rev-parse HEAD]
-          end
+        Dir.chdir repo_path do
+          %x[git rev-parse #{tag}].should == %x[git rev-parse HEAD]
         end
       end
+    end
 
-      describe "::rev_parse" do
-        let(:repo_path) { tmp_path.join("nginx") }
-        before(:each) do
-          subject.clone("git://github.com/opscode-cookbooks/nginx.git", repo_path)
-          subject.checkout(repo_path, "0e4887d9eef8cb83972f974a85890983c8204c3b")
-        end
+    describe "::rev_parse" do
+      let(:repo_path) { tmp_path.join("nginx") }
+      before(:each) do
+        subject.clone("git://github.com/opscode-cookbooks/nginx.git", repo_path)
+        subject.checkout(repo_path, "0e4887d9eef8cb83972f974a85890983c8204c3b")
+      end
 
-        it "returns the ref for HEAD" do
-          subject.rev_parse(repo_path).should eql("0e4887d9eef8cb83972f974a85890983c8204c3b")
-        end
+      it "returns the ref for HEAD" do
+        subject.rev_parse(repo_path).should eql("0e4887d9eef8cb83972f974a85890983c8204c3b")
       end
+    end
 
-      let(:readonly_uri) { "git://github.com/reset/thor-foodcritic.git" }
-      let(:https_uri) { "https://github.com/reset/solve.git" }
-      let(:http_uri) { "http://github.com/reset/solve.git" }
-      let(:invalid_uri) { "/something/on/disk" }
+    let(:readonly_uri) { "git://github.com/reset/thor-foodcritic.git" }
+    let(:https_uri) { "https://github.com/reset/solve.git" }
+    let(:http_uri) { "http://github.com/reset/solve.git" }
+    let(:invalid_uri) { "/something/on/disk" }
 
-      describe "::validate_uri" do
-        context "given a valid Git read-only URI" do
-          it "returns true" do
-            subject.validate_uri(readonly_uri).should be_true
-          end
+    describe "::validate_uri" do
+      context "given a valid Git read-only URI" do
+        it "returns true" do
+          subject.validate_uri(readonly_uri).should be_true
         end
+      end
 
-        context "given a valid Git HTTPS URI" do
-          it "returns true" do
-            subject.validate_uri(https_uri).should be_true
-          end
+      context "given a valid Git HTTPS URI" do
+        it "returns true" do
+          subject.validate_uri(https_uri).should be_true
         end
+      end
 
-        context "given a valid Github SSH URI" do
-          it "returns true" do
-            subject.validate_uri("git@github.com:reset/solve.git").should be_true
-          end
+      context "given a valid Github SSH URI" do
+        it "returns true" do
+          subject.validate_uri("git@github.com:reset/solve.git").should be_true
         end
+      end
 
-        context "given a valid SSH URI without an 'organization'" do
-          it "returns true" do
-            subject.validate_uri("gituser@githost:solve.git").should be_true
-          end
+      context "given a valid SSH URI without an 'organization'" do
+        it "returns true" do
+          subject.validate_uri("gituser@githost:solve.git").should be_true
         end
+      end
 
-        context "given an invalid URI" do
-          it "returns false" do
-            subject.validate_uri(invalid_uri).should be_false
-          end
+      context "given an invalid URI" do
+        it "returns false" do
+          subject.validate_uri(invalid_uri).should be_false
         end
+      end
 
-        context "given a HTTP URI" do
-          it "returns false" do
-            subject.validate_uri(http_uri).should be_false
-          end
+      context "given a HTTP URI" do
+        it "returns false" do
+          subject.validate_uri(http_uri).should be_false
         end
+      end
 
-        context "given an integer" do
-          it "returns false" do
-            subject.validate_uri(123).should be_false
-          end
+      context "given an integer" do
+        it "returns false" do
+          subject.validate_uri(123).should be_false
         end
       end
+    end
 
-      describe "::validate_uri!" do
-        context "given a valid Git read-only URI" do
-          it "returns true" do
-            subject.validate_uri!(readonly_uri).should be_true
-          end
+    describe "::validate_uri!" do
+      context "given a valid Git read-only URI" do
+        it "returns true" do
+          subject.validate_uri!(readonly_uri).should be_true
         end
+      end
 
-        context "given a valid Git HTTPS URI" do
-          it "returns true" do
-            subject.validate_uri!(https_uri).should be_true
-          end
+      context "given a valid Git HTTPS URI" do
+        it "returns true" do
+          subject.validate_uri!(https_uri).should be_true
         end
+      end
 
-        context "given a valid Git SSH URI" do
-          it "returns true" do
-            subject.validate_uri!("git@github.com:reset/solve.git").should be_true
-          end
+      context "given a valid Git SSH URI" do
+        it "returns true" do
+          subject.validate_uri!("git@github.com:reset/solve.git").should be_true
         end
+      end
 
-        context "given a valid SSH URI without an 'organization'" do
-          it "returns true" do
-            subject.validate_uri("gituser@githost:solve.git").should be_true
-          end
+      context "given a valid SSH URI without an 'organization'" do
+        it "returns true" do
+          subject.validate_uri("gituser@githost:solve.git").should be_true
         end
+      end
 
-        context "given an invalid URI" do
-          it "raises InvalidGitURI" do
-            lambda {
-              subject.validate_uri!(invalid_uri)
-            }.should raise_error(InvalidGitURI)
-          end
+      context "given an invalid URI" do
+        it "raises InvalidGitURI" do
+          lambda {
+            subject.validate_uri!(invalid_uri)
+          }.should raise_error(Berkshelf::InvalidGitURI)
         end
+      end
 
-        context "given a HTTP URI" do
-          it "raises InvalidGitURI" do
-            lambda {
-              subject.validate_uri!(http_uri)
-            }.should raise_error(InvalidGitURI)
-          end
+      context "given a HTTP URI" do
+        it "raises InvalidGitURI" do
+          lambda {
+            subject.validate_uri!(http_uri)
+          }.should raise_error(Berkshelf::InvalidGitURI)
         end
+      end
 
-        context "given an integer" do
-          it "raises InvalidGitURI" do
-            lambda {
-              subject.validate_uri!(123)
-            }.should raise_error(InvalidGitURI)
-          end
+      context "given an integer" do
+        it "raises InvalidGitURI" do
+          lambda {
+            subject.validate_uri!(123)
+          }.should raise_error(Berkshelf::InvalidGitURI)
         end
       end
     end

data/spec/unit/berkshelf/locations/git_location_spec.rb

@@ -14,6 +14,12 @@ module Berkshelf
           }.should raise_error(InvalidGitURI)
         end
       end
+
+      describe "::tmpdir" do
+        it "creates a temporary directory within the Berkshelf temporary directory" do
+          subject.tmpdir.should include(Berkshelf.tmp_dir)
+        end
+      end
     end
 
     subject { GitLocation.new("artifact", complacent_constraint, git: "git://github.com/RiotGames/artifact-cookbook.git") }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-12 00:00:00.000000000 Z
+date: 2012-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
@@ -361,7 +361,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4545769235326806267
+      hash: 2215402916599096616
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23