librarian 0.0.12 → 0.0.13

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 0.0.13
+
+* \#36 Fixes an issue where, if a dependency has a git source (the upstream), and the upstream is updated,
+    then attempting to update that dependency in the local resolution would not update that dependency so
+    long as that git source were cached (@databus23).
+
+* More immediate detection of, and better error messages for, cases of blank dependency or manifest names
+    or cases of names that are otherwise insensible, such as names that are untrimmed.
+
 ## 0.0.12
 
 * Fixes an issue where, if a dependency has a git source with a ref, re-resolving may fail.

data/README.md

@@ -12,7 +12,7 @@ The mock source is in-process and in-memory and does not touch the filesystem or
 Librarian::Chef
 ---------------
 
-An adapter for Librarian applying to Chef cookbooks in a Chef Repository.
+An adapter for Librarian applying to Chef cookbooks in a Chef Repository. When used with Chef, Librarian is really for pulling in the 50 or so finished third-party cookbooks that you're using, not the 1 or 2 cookbooks you're actively working on.
 
 ## Install librarian:
 
@@ -24,6 +24,7 @@ __Make sure your cookbooks directory is gitignored__
     $ cd ~/path/to/chef-repo
     $ git rm -r cookbooks # if the directory is present
     $ echo cookbooks >> .gitignore
+    $ echo tmp >> .gitignore
 
 Note that librarian *takes over* your cookbooks directory
   and manages it for you based on your Cheffile. Your
@@ -40,7 +41,7 @@ __Add dependencies and their sources to Cheffile__
     $ cat Cheffile
         site 'http://community.opscode.com/api/v1'
         cookbook 'ntp'
-        cookbook 'timezone'
+        cookbook 'timezone', '0.0.1'
         cookbook 'rvm',
           :git => 'https://github.com/fnichol/chef-rvm',
           :ref => 'v0.7.1'
@@ -59,7 +60,7 @@ __Update your cheffile with new/changed/removed constraints/sources/dependencies
     $ cat Cheffile
         site 'http://community.opscode.com/api/v1'
         cookbook 'ntp'
-        cookbook 'timezone'
+        cookbook 'timezone', '0.0.1'
         cookbook 'rvm',
           :git => 'https://github.com/fnichol/chef-rvm',
           :ref => 'v0.7.1'

data/lib/librarian/action/update.rb

@@ -17,6 +17,8 @@ module Librarian
         spec = specfile.read(previous_resolution.sources)
         spec_changes = spec_change_set(spec, previous_resolution)
         raise Error, "Cannot update when the specfile has been changed." unless spec_changes.same?
+        unpinnable_sources = previous_resolution.sources - partial_manifests.map(&:source)
+        unpinnable_sources.each(&:unpin!)
         resolution = resolver.resolve(spec, partial_manifests)
         unless resolution.correct?
           raise Error, "Could not resolve the dependencies."

data/lib/librarian/chef/source/site.rb

@@ -54,6 +54,13 @@ module Librarian
           {:remote => uri}
         end
 
+        def pinned?
+          false
+        end
+
+        def unpin!
+        end
+
         def cache!(dependencies)
           cache_path.mkpath
           dependencies.each do |dependency|

data/lib/librarian/chef/templates/Cheffile

@@ -5,6 +5,8 @@ site 'http://community.opscode.com/api/v1'
 
 # cookbook 'chef-client'
 
+# cookbook 'apache2', '>= 1.0.0'
+
 # cookbook 'rvm',
 #   :git => 'https://github.com/fnichol/chef-rvm'
 

data/lib/librarian/dependency.rb

@@ -10,12 +10,16 @@ module Librarian
 
     include Helpers::Debug
 
-    attr_reader :name, :requirement, :source
+    attr_accessor :name, :requirement, :source
+    private :name=, :requirement=, :source=
 
     def initialize(name, requirement, source)
-      @name = name
-      @requirement = Requirement.create(requirement)
-      @source = source
+      assert_name_valid! name
+
+      self.name = name
+      self.requirement = Requirement.create(requirement)
+      self.source = source
+
       @manifests = nil
     end
 
@@ -50,5 +54,9 @@ module Librarian
       source.environment
     end
 
+    def assert_name_valid!(name)
+      raise ArgumentError, "name (#{name.inspect}) must be sensible" unless name =~ /^\S.*\S$/
+    end
+
   end
 end

data/lib/librarian/manifest.rb

@@ -12,14 +12,18 @@ module Librarian
     include Support::AbstractMethod
     include Helpers::Debug
 
-    attr_reader :source, :name
+    attr_accessor :source, :name
+    private :source=, :name=
 
     abstract_method :fetch_version!, :fetch_dependencies!
     abstract_method :install!
 
     def initialize(source, name)
-      @source = source
-      @name = name
+      assert_name_valid! name
+
+      self.source = source
+      self.name = name
+
       @fetched_version = nil
       @defined_version = nil
       @fetched_dependencies = nil
@@ -84,5 +88,9 @@ module Librarian
       dependencies.sort_by{|d| d.name}
     end
 
+    def assert_name_valid!(name)
+      raise ArgumentError, "name (#{name.inspect}) must be sensible" unless name =~ /^\S.*\S$/
+    end
+
   end
 end

data/lib/librarian/source/git.rb

@@ -65,6 +65,14 @@ module Librarian
         options
       end
 
+      def pinned?
+        !!sha
+      end
+
+      def unpin!
+        @sha = nil
+      end
+
       def cache!(dependencies)
         unless repository.git?
           repository.path.rmtree if repository.path.exist?
@@ -73,7 +81,9 @@ module Librarian
         end
         unless sha == repository.current_commit_hash
           repository.fetch!(:tags => true)
-          repository.checkout!(sha || ref)
+          repository.fetch!
+          repository.merge_all_remote_branches!
+          repository.reset_hard! repository.hash_from(sha || ref)
           @sha ||= repository.current_commit_hash
         end
       end

data/lib/librarian/source/git/repository.rb

@@ -47,6 +47,13 @@ module Librarian
           end
         end
 
+        def reset_hard!(reference)
+          within do
+            command = "reset --hard #{reference}"
+            run!(command, false)
+          end
+        end
+
         def fetch!(options = { })
           within do
             command = "fetch"
@@ -55,6 +62,13 @@ module Librarian
           end
         end
 
+        def merge!(reference)
+          within do
+            command = "merge #{reference}"
+            run!(command)
+          end
+        end
+
         def hash_from(reference)
           within do
             command = "rev-parse #{reference}"
@@ -69,10 +83,26 @@ module Librarian
           end
         end
 
+        def merge_all_remote_branches!
+          remote_branches.each do |branch|
+            checkout!(branch.slice(%r{[^/]+$}))
+            merge! branch
+          end
+        end
+
+        def remote_branches
+          within do
+            command ="branch -r --no-color"
+            run!(command, false).split("\n  ").reject do |r|
+              r.include? '->' #delete pointers like origin/HEAD -> origin/master
+            end.collect {|r|r.strip}
+          end
+        end
       private
 
-        def run!(text)
-          text = "git #{text} --quiet"
+        def run!(text, quiet = true)
+          text = "git #{text}"
+          text << " --quiet" if quiet
           debug { "Running `#{text}` in #{relative_path_to(Dir.pwd)}" }
           out = Open3.popen3(text) do |i, o, e, t|
             raise StandardError, e.read unless (t ? t.value : $?).success?

data/lib/librarian/source/path.rb

@@ -43,6 +43,13 @@ module Librarian
         {:remote => path}
       end
 
+      def pinned?
+        false
+      end
+
+      def unpin!
+      end
+
       def cache!(dependencies)
       end
 

data/lib/librarian/spec.rb

@@ -1,10 +1,12 @@
 module Librarian
   class Spec
 
-    attr_reader :source, :dependencies
+    attr_accessor :source, :dependencies
+    private :source=, :dependencies=
 
     def initialize(source, dependencies)
-      @source, @dependencies = source, dependencies
+      self.source = source
+      self.dependencies = dependencies
     end
 
   end

data/lib/librarian/version.rb

@@ -1,3 +1,3 @@
 module Librarian
-  VERSION = "0.0.12"
+  VERSION = "0.0.13"
 end

data/spec/functional/chef/source/git_spec.rb

@@ -6,6 +6,7 @@ require 'librarian/helpers'
 require 'librarian/error'
 require 'librarian/action/resolve'
 require 'librarian/action/install'
+require 'librarian/action/update'
 require 'librarian/chef'
 
 module Librarian
@@ -337,6 +338,94 @@ module Librarian
           end
         end
 
+        context "when upstream updates" do
+          let(:git_path) { tmp_path.join("upstream-updates-repo") }
+          let(:repo_path) { tmp_path.join("repo/resolve-with-upstream-updates") }
+
+          let(:sample_metadata) do
+            Helpers.strip_heredoc(<<-METADATA)
+              version "0.6.5"
+            METADATA
+          end
+          before do
+
+            # set up the git repo as normal, but let's also set up a release-stable branch
+            # from which our Cheffile will only pull stable releases
+            git_path.rmtree if git_path.exist?
+            git_path.mkpath
+            git_path.join("metadata.rb").open("w+b"){|f| f.write(sample_metadata)}
+
+            Dir.chdir(git_path) do
+              `git init`
+              `git add metadata.rb`
+              `git commit -m "Initial Commit."`
+              `git checkout -b some-branch --quiet`
+              `echo 'hi' > some-file`
+              `git add some-file`
+              `git commit -m 'Some File.'`
+              `git checkout master --quiet`
+            end
+
+            # set up the chef repo as normal, except the Cheffile points to the release-stable
+            # branch - we expect when the upstream copy of that branch is changed, then we can
+            # fetch & merge those changes when we update
+            repo_path.rmtree if repo_path.exist?
+            repo_path.mkpath
+            repo_path.join("cookbooks").mkpath
+            cheffile = Helpers.strip_heredoc(<<-CHEFFILE)
+              cookbook "sample",
+                :git => #{git_path.to_s.inspect},
+                :ref => "some-branch"
+            CHEFFILE
+            repo_path.join("Cheffile").open("wb") { |f| f.write(cheffile) }
+            Action::Resolve.new(env).run
+
+            # change the upstream copy of that branch: we expect to be able to pull the latest
+            # when we re-resolve
+            Dir.chdir(git_path) do
+              `git checkout some-branch --quiet`
+              `echo 'ho' > some-other-file`
+              `git add some-other-file`
+              `git commit -m 'Some Other File.'`
+              `git checkout master --quiet`
+            end
+          end
+
+          let(:metadata_file) { repo_path.join("cookbooks/sample/metadata.rb") }
+          let(:old_code_file) { repo_path.join("cookbooks/sample/some-file") }
+          let(:new_code_file) { repo_path.join("cookbooks/sample/some-other-file") }
+
+          context "when updating not a cookbook from that source" do
+            before do
+              Action::Update.new(env).run
+            end
+
+            it "should pull the tip from upstream" do
+              Action::Install.new(env).run
+
+              metadata_file.should exist #sanity
+              old_code_file.should exist #sanity
+
+              new_code_file.should_not exist # the assertion
+            end
+          end
+
+          context "when updating a cookbook from that source" do
+            before do
+              Action::Update.new(env, :names => %w(sample)).run
+            end
+
+            it "should pull the tip from upstream" do
+              Action::Install.new(env).run
+
+              metadata_file.should exist #sanity
+              old_code_file.should exist #sanity
+
+              new_code_file.should exist # the assertion
+            end
+          end
+        end
+
       end
     end
   end

data/spec/unit/dependency_spec.rb

@@ -0,0 +1,30 @@
+require "librarian/dependency"
+
+describe Librarian::Dependency do
+
+  describe "validations" do
+
+    context "when the name is blank" do
+      it "raises" do
+        expect { described_class.new("", [], nil) }.
+          to raise_error(ArgumentError, %{name ("") must be sensible})
+      end
+    end
+
+    context "when the name has leading whitespace" do
+      it "raises" do
+        expect { described_class.new("  the-name", [], nil) }.
+          to raise_error(ArgumentError, %{name ("  the-name") must be sensible})
+      end
+    end
+
+    context "when the name has trailing whitespace" do
+      it "raises" do
+        expect { described_class.new("the-name  ", [], nil) }.
+          to raise_error(ArgumentError, %{name ("the-name  ") must be sensible})
+      end
+    end
+
+  end
+
+end

data/spec/unit/dsl_spec.rb

@@ -8,6 +8,17 @@ module Librarian
 
       let(:env) { Environment.new }
 
+      context "a single source and a single dependency with a blank name" do
+        it "should not not run with a blank name" do
+          expect do
+            env.dsl do
+              src 'source-1'
+              dep ''
+            end
+          end.to raise_error(ArgumentError, %{name ("") must be sensible})
+        end
+      end
+
       context "a single dependency but no applicable source" do
 
         it "should not run without any sources" do

data/spec/unit/manifest_spec.rb

@@ -0,0 +1,30 @@
+require "librarian/manifest"
+
+describe Librarian::Manifest do
+
+  describe "validations" do
+
+    context "when the name is blank" do
+      it "raises" do
+        expect { described_class.new(nil, "") }.
+          to raise_error(ArgumentError, %{name ("") must be sensible})
+      end
+    end
+
+    context "when the name has leading whitespace" do
+      it "raises" do
+        expect { described_class.new(nil, "  the-name") }.
+          to raise_error(ArgumentError, %{name ("  the-name") must be sensible})
+      end
+    end
+
+    context "when the name has trailing whitespace" do
+      it "raises" do
+        expect { described_class.new(nil, "the-name  ") }.
+          to raise_error(ArgumentError, %{name ("the-name  ") must be sensible})
+      end
+    end
+
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: librarian
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-18 00:00:00.000000000Z
+date: 2012-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &34503640 !ruby/object:Gem::Requirement
+  requirement: &16739740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *34503640
+  version_requirements: *16739740
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &34503220 !ruby/object:Gem::Requirement
+  requirement: &16753740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *34503220
+  version_requirements: *16753740
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &34502800 !ruby/object:Gem::Requirement
+  requirement: &16751920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *34502800
+  version_requirements: *16751920
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &34502380 !ruby/object:Gem::Requirement
+  requirement: &16749300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *34502380
+  version_requirements: *16749300
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &34501960 !ruby/object:Gem::Requirement
+  requirement: &16748440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *34501960
+  version_requirements: *16748440
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &34501540 !ruby/object:Gem::Requirement
+  requirement: &16754860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *34501540
+  version_requirements: *16754860
 - !ruby/object:Gem::Dependency
   name: chef
-  requirement: &34501040 !ruby/object:Gem::Requirement
+  requirement: &17524920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0.10'
   type: :runtime
   prerelease: false
-  version_requirements: *34501040
+  version_requirements: *17524920
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &34500620 !ruby/object:Gem::Requirement
+  requirement: &17522700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *34500620
+  version_requirements: *17522700
 description: Librarian
 email:
 - y_feldblum@yahoo.com
@@ -188,9 +188,11 @@ files:
 - spec/unit/action/clean_spec.rb
 - spec/unit/action/ensure_spec.rb
 - spec/unit/action/install_spec.rb
+- spec/unit/dependency_spec.rb
 - spec/unit/dsl_spec.rb
 - spec/unit/environment_spec.rb
 - spec/unit/lockfile_spec.rb
+- spec/unit/manifest_spec.rb
 - spec/unit/mock/source/mock.rb
 - spec/unit/resolver_spec.rb
 - spec/unit/spec_change_set_spec.rb