librarian 0.0.1 → 0.0.2

data/README.md

@@ -16,20 +16,59 @@ An adapter for Librarian applying to Chef cookbooks in a Chef Repository.
 
 Usage:
 
+    # install librarian onto your system
+    $ gem install librarian
+
     $ cd ~/path/to/chef-repo
-    # put dependencies and their sources into ./Cheffile
 
-    # resolve dependencies:
-    $ librarian-chef resolve [--clean] [--verbose]
+    # make sure your cookbooks directory exists but is gitignored
+    $ git rm -r cookbooks # if the directory is present
+    $ mkdir cookbooks
+    $ echo cookbooks >> .gitignore
+
+    # put dependencies and their sources into Cheffile
+    $ cat Cheffile
+        site 'http://community.opscode.com/api/v1'
+        cookbook 'ntp'
+        cookbook 'timezone'
+        cookbook 'rvm',
+          :git => 'https://github.com/fnichol/chef-rvm',
+          :ref => 'v0.7.1'
 
     # install dependencies into ./cookbooks
     $ librarian-chef install [--clean] [--verbose]
 
+    # check into version control your ./Cheffile.lock
+    $ git add Cheffile.lock
+    $ git commit -m "I want these particular versions of these particular cookbooks from these particular."
+
     # update your cheffile with new/changed/removed constraints/sources/dependencies
+    $ cat Cheffile
+        site 'http://community.opscode.com/api/v1'
+        cookbook 'ntp'
+        cookbook 'timezone'
+        cookbook 'rvm',
+          :git => 'https://github.com/fnichol/chef-rvm',
+          :ref => 'v0.7.1'
+        cookbook 'monit' # new!
+    $ git diff Cheffile
     $ librarian-chef install [--verbose]
+    $ git diff Cheffile.lock
+    $ git add Cheffile
+    $ git add Cheffile.lock
+    $ git commit -m "I also want these additional cookbooks."
 
     # update the version of a dependency
-    $ librarian-chef update dependency-1 dependency-2 dependency-3 [--verbose]
+    $ librarian-chef update ntp timezone monit [--verbose]
+    $ git diff Cheffile.lock
+    $ git add Cheffile.lock
+    $ git commit -m "I want updated versions of these cookbooks."
+
+    # push your changes to the git repository
+    $ git push origin master
+
+    # upload the cookbooks to your chef-server
+    $ knife cookbook upload --all
 
 You should `.gitignore` your `./cookbooks` directory.
 If you are manually tracking/vendoring outside cookbooks within the repository,

data/lib/librarian/source/git.rb

@@ -27,12 +27,13 @@ module Librarian
         :ref => 'master'
       }
 
-      attr_reader :uri, :ref, :sha
+      attr_reader :uri, :ref, :sha, :path
 
       def initialize(uri, options = {})
         @uri = uri
         @ref = options[:ref] || DEFAULTS[:ref]
         @sha = options[:sha]
+        @path = options[:path]
         @repository = nil
         @repository_cache_path = nil
       end
@@ -46,15 +47,20 @@ module Librarian
         self.class  == other.class  &&
         self.uri    == other.uri    &&
         self.ref    == other.ref    &&
+        self.path   == other.path   &&
         (self.sha.nil? || other.sha.nil? || self.sha == other.sha)
       end
 
       def to_spec_args
-        [uri, {:ref => ref}]
+        options = {:ref => ref}
+        options.merge!(:path => path) if path
+        [uri, options]
       end
 
       def to_lock_options
-        {:remote => uri, :ref => ref, :sha => sha}
+        options = {:remote => uri, :ref => ref, :sha => sha}
+        options.merge!(:path => path) if path
+        options
       end
 
       def cache!(dependencies)
@@ -71,7 +77,8 @@ module Librarian
 
       def repository_cache_path
         @repository_cache_path ||= begin
-          dir = Digest::MD5.hexdigest(uri)
+          dir = path ? "#{uri}/#{path}" : uri
+          dir = Digest::MD5.hexdigest(dir)
           root_module.cache_path.join("source/git/#{dir}")
         end
       end
@@ -82,8 +89,18 @@ module Librarian
         end
       end
 
-      def path
-        @path ||= repository.path
+      def filesystem_path
+        @filesystem_path ||= repository.path
+      end
+
+      # Override Local#manifest_search_paths
+      def manifest_search_paths(dependency)
+        if path.nil?
+          paths = [filesystem_path, filesystem_path.join(dependency.name)]
+          paths.select{|s| s.exist?}
+        else
+          [filesystem_path.join(path)]
+        end
       end
 
     end

data/lib/librarian/source/local.rb

@@ -12,19 +12,19 @@ module Librarian
       abstract_method :path
 
       def manifests(dependency)
-        manifest = manifest_class.create(self, dependency, path)
+        manifest = manifest_class.create(self, dependency, filesystem_path)
         [manifest].compact
       end
 
       def manifest(name, version, dependencies)
-        manifest = manifest_class.create(self, Dependency.new(name, nil, nil), path)
+        manifest = manifest_class.create(self, Dependency.new(name, nil, nil), filesystem_path)
         manifest.version = version
         manifest.dependencies = dependencies
         manifest
       end
 
       def manifest_search_paths(dependency)
-        paths = [path, path.join(dependency.name)]
+        paths = [filesystem_path, filesystem_path.join(dependency.name)]
         paths.select{|s| s.exist?}
       end
 

data/lib/librarian/source/path.rb

@@ -21,7 +21,7 @@ module Librarian
       attr_reader :path
 
       def initialize(path, options)
-        @path = Pathname.new(path).expand_path(root_module.project_path)
+        @path = path
       end
 
       def to_s
@@ -39,14 +39,16 @@ module Librarian
       end
 
       def to_lock_options
-        absolute_path = path.absolute? ? path : path.expand_path(root_module.project_path)
-        relative_path = path.relative? ? path : path.relative_path_from(root_module.project_path)
-        {:remote => relative_path.to_s[0, 3] == '../' ? absolute_path : relative_path}
+        {:remote => path}
       end
 
       def cache!(dependencies)
       end
 
+      def filesystem_path
+        @filesystem_path ||= Pathname.new(path).expand_path(root_module.project_path)
+      end
+
     end
   end
 end

data/lib/librarian/version.rb

@@ -1,3 +1,3 @@
 module Librarian
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/librarian.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec"
   s.add_development_dependency "cucumber"
   s.add_development_dependency "aruba"
+  s.add_development_dependency "webmock"
 
   s.add_development_dependency "chef", ">= 0.10"
 end

data/spec/chef/git_source_spec.rb

@@ -13,24 +13,25 @@ module Librarian
         project_path = Pathname.new(__FILE__).expand_path
         project_path = project_path.dirname until project_path.join("Rakefile").exist?
         tmp_path = project_path.join("tmp/spec/chef/git-source")
-        sample_path = tmp_path.join('sample')
-        sample_metadata = Helpers.strip_heredoc(<<-METADATA)
-          version '0.6.5'
-        METADATA
-
-        before :all do
-          sample_path.rmtree if sample_path.exist?
-          sample_path.mkpath
-          sample_path.join('metadata.rb').open('wb') { |f| f.write(sample_metadata) }
-          Dir.chdir(sample_path) do
-            `git init`
-            `git add metadata.rb`
-            `git commit -m "Initial commit."`
-          end
-        end
 
         context "a single dependency with a git source" do
 
+          sample_path = tmp_path.join('sample')
+          sample_metadata = Helpers.strip_heredoc(<<-METADATA)
+            version '0.6.5'
+          METADATA
+
+          before :all do
+            sample_path.rmtree if sample_path.exist?
+            sample_path.mkpath
+            sample_path.join('metadata.rb').open('wb') { |f| f.write(sample_metadata) }
+            Dir.chdir(sample_path) do
+              `git init`
+              `git add metadata.rb`
+              `git commit -m "Initial commit."`
+            end
+          end
+
           it "should resolve" do
             repo_path = tmp_path.join('repo/resolve')
             repo_path.rmtree if repo_path.exist?
@@ -87,6 +88,86 @@ module Librarian
 
         end
 
+        context "with a path" do
+
+          git_path = tmp_path.join('big-git-repo')
+          sample_path = git_path.join('buttercup')
+          sample_metadata = Helpers.strip_heredoc(<<-METADATA)
+            version '0.6.5'
+          METADATA
+
+          before :all do
+            git_path.rmtree if git_path.exist?
+            git_path.mkpath
+            sample_path.mkpath
+            sample_path.join('metadata.rb').open('wb') { |f| f.write(sample_metadata) }
+            Dir.chdir(git_path) do
+              `git init`
+              `git add .`
+              `git commit -m "Initial commit."`
+            end
+          end
+
+          context "if no path option is given" do
+            it "should not resolve" do
+              repo_path = tmp_path.join('repo/resolve')
+              repo_path.rmtree if repo_path.exist?
+              repo_path.mkpath
+              repo_path.join('cookbooks').mkpath
+              cheffile = Helpers.strip_heredoc(<<-CHEFFILE)
+                #!/usr/bin/env ruby
+                cookbook "sample",
+                  :git => #{git_path.to_s.inspect}
+              CHEFFILE
+              repo_path.join('Cheffile').open('wb') { |f| f.write(cheffile) }
+              Chef.stub!(:project_path) { repo_path }
+
+              expect{ Chef.resolve! }.to raise_error
+            end
+          end
+
+          context "if the path option is wrong" do
+            it "should not resolve" do
+              repo_path = tmp_path.join('repo/resolve')
+              repo_path.rmtree if repo_path.exist?
+              repo_path.mkpath
+              repo_path.join('cookbooks').mkpath
+              cheffile = Helpers.strip_heredoc(<<-CHEFFILE)
+                #!/usr/bin/env ruby
+                cookbook "sample",
+                  :git => #{git_path.to_s.inspect},
+                  :path => "jelly"
+              CHEFFILE
+              repo_path.join('Cheffile').open('wb') { |f| f.write(cheffile) }
+              Chef.stub!(:project_path) { repo_path }
+
+              expect{ Chef.resolve! }.to raise_error
+            end
+          end
+
+          context "if the path option is right" do
+            it "should not resolve" do
+              repo_path = tmp_path.join('repo/resolve')
+              repo_path.rmtree if repo_path.exist?
+              repo_path.mkpath
+              repo_path.join('cookbooks').mkpath
+              cheffile = Helpers.strip_heredoc(<<-CHEFFILE)
+                #!/usr/bin/env ruby
+                cookbook "sample",
+                  :git => #{git_path.to_s.inspect},
+                  :path => "buttercup"
+              CHEFFILE
+              repo_path.join('Cheffile').open('wb') { |f| f.write(cheffile) }
+              Chef.stub!(:project_path) { repo_path }
+
+              Chef.resolve!
+              repo_path.join('Cheffile.lock').should be_exist
+              repo_path.join('cookbooks/sample').should_not be_exist
+            end
+          end
+
+        end
+
       end
     end
   end

data/spec/chef/site_source_spec.rb

@@ -0,0 +1,120 @@
+require 'webmock'
+
+require 'librarian'
+require 'librarian/helpers'
+require 'librarian/chef'
+
+module Librarian
+  module Chef
+    module Source
+      describe Site do
+
+        include WebMock::API
+
+        project_path = Pathname.new(__FILE__).expand_path
+        project_path = project_path.dirname until project_path.join("Rakefile").exist?
+        tmp_path = project_path.join("tmp/spec/chef/site-source")
+        sample_path = tmp_path.join('sample')
+        sample_metadata = Helpers.strip_heredoc(<<-METADATA)
+          version '0.6.5'
+        METADATA
+
+        api_url = "http://site.cookbooks.com"
+
+        sample_index_data = {
+          "name" => "sample",
+          "versions" => [
+            "#{api_url}/cookbooks/sample/versions/0_6_5"
+          ]
+        }
+        sample_0_6_5_data = {
+          "version" => "0.6.5",
+          "file" => "#{api_url}/cookbooks/sample/versions/0_6_5/file.tar.gz"
+        }
+
+        before :all do
+          sample_path.rmtree if sample_path.exist?
+          sample_path.mkpath
+          sample_path.join('metadata.rb').open('wb') { |f| f.write(sample_metadata) }
+          Dir.chdir(sample_path.dirname) do
+            system "tar --create --gzip --file sample.tar.gz #{sample_path.basename}"
+          end
+        end
+
+        before do
+          stub_request(:get, "#{api_url}/cookbooks/sample").
+            to_return(:body => JSON.dump(sample_index_data))
+
+          stub_request(:get, "#{api_url}/cookbooks/sample/versions/0_6_5").
+            to_return(:body => JSON.dump(sample_0_6_5_data))
+
+          stub_request(:get, "#{api_url}/cookbooks/sample/versions/0_6_5/file.tar.gz").
+            to_return(:body => sample_path.dirname.join("sample.tar.gz").read)
+        end
+
+        after do
+          WebMock.reset!
+        end
+
+        context "a single dependency with a site source" do
+
+          it "should resolve" do
+            repo_path = tmp_path.join('repo/resolve')
+            repo_path.rmtree if repo_path.exist?
+            repo_path.mkpath
+            repo_path.join('cookbooks').mkpath
+            cheffile = Helpers.strip_heredoc(<<-CHEFFILE)
+              #!/usr/bin/env ruby
+              cookbook "sample", :site => "#{api_url}"
+            CHEFFILE
+            repo_path.join('Cheffile').open('wb') { |f| f.write(cheffile) }
+            Chef.stub!(:project_path) { repo_path }
+
+            Chef.resolve!
+            repo_path.join('Cheffile.lock').should be_exist
+            repo_path.join('cookbooks/sample').should_not be_exist
+          end
+
+          it "should install" do
+            repo_path = tmp_path.join('repo/install')
+            repo_path.rmtree if repo_path.exist?
+            repo_path.mkpath
+            repo_path.join('cookbooks').mkpath
+            cheffile = Helpers.strip_heredoc(<<-CHEFFILE)
+              #!/usr/bin/env ruby
+              cookbook "sample", :site => "#{api_url}"
+            CHEFFILE
+            repo_path.join('Cheffile').open('wb') { |f| f.write(cheffile) }
+            Chef.stub!(:project_path) { repo_path }
+
+            Chef.install!
+            repo_path.join('Cheffile.lock').should be_exist
+            repo_path.join('cookbooks/sample').should be_exist
+            repo_path.join('cookbooks/sample/metadata.rb').should be_exist
+          end
+
+          it "should resolve and separately install" do
+            repo_path = tmp_path.join('repo/resolve-install')
+            repo_path.rmtree if repo_path.exist?
+            repo_path.mkpath
+            repo_path.join('cookbooks').mkpath
+            cheffile = Helpers.strip_heredoc(<<-CHEFFILE)
+              #!/usr/bin/env ruby
+              cookbook "sample", :site => "#{api_url}"
+            CHEFFILE
+            repo_path.join('Cheffile').open('wb') { |f| f.write(cheffile) }
+            Chef.stub!(:project_path) { repo_path }
+
+            Chef.resolve!
+            repo_path.join('tmp').rmtree if repo_path.join('tmp').exist?
+            Chef.install!
+            repo_path.join('cookbooks/sample').should be_exist
+            repo_path.join('cookbooks/sample/metadata.rb').should be_exist
+          end
+
+        end
+
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: librarian
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-20 00:00:00.000000000Z
+date: 2011-06-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &12204460 !ruby/object:Gem::Requirement
+  requirement: &11791400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12204460
+  version_requirements: *11791400
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &12203620 !ruby/object:Gem::Requirement
+  requirement: &11789160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12203620
+  version_requirements: *11789160
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &12199460 !ruby/object:Gem::Requirement
+  requirement: &11462680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12199460
+  version_requirements: *11462680
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &12198500 !ruby/object:Gem::Requirement
+  requirement: &11460640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12198500
+  version_requirements: *11460640
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: &11459060 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *11459060
 - !ruby/object:Gem::Dependency
   name: chef
-  requirement: &12197740 !ruby/object:Gem::Requirement
+  requirement: &11456440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +76,7 @@ dependencies:
         version: '0.10'
   type: :development
   prerelease: false
-  version_requirements: *12197740
+  version_requirements: *11456440
 description: Librarian
 email:
 - y_feldblum@yahoo.com
@@ -134,6 +145,7 @@ files:
 - lib/librarian/version.rb
 - librarian.gemspec
 - spec/chef/git_source_spec.rb
+- spec/chef/site_source_spec.rb
 - spec/dsl_spec.rb
 - spec/lockfile_spec.rb
 - spec/meta/requires_spec.rb
@@ -153,7 +165,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 92490891024378775
+      hash: 695538775137796306
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -162,7 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 92490891024378775
+      hash: 695538775137796306
 requirements: []
 rubyforge_project: librarian
 rubygems_version: 1.7.1