librarian-chef 0.0.1 → 0.0.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 950187ce3da19669233c3f801545c4ed7f090bd7
+  data.tar.gz: d342abdad8f21e4deaec5c85207bb4462de51366
+SHA512:
+  metadata.gz: 82af4d4079d644156065ed2747fb23686fda4678f15711e355abd3558389737d5a56618fee67018c16de67762cfe0191336f2a13ddb68f1585d95b0544bd4344
+  data.tar.gz: 990d08487fcd2a6d1afa919f951917041022acd284feaf17ddee534520304acdb717d97c85250a48a790c58df0378a76dcd7b57dc0f80dc7ee1d3fda3c6e019c

data/.travis.yml

@@ -12,8 +12,6 @@ rvm:
   - ruby-head
 matrix:
   allow_failures:
-    - rvm: rbx-18mode
-    - rvm: rbx-19mode
     - rvm: jruby-18mode
     - rvm: jruby-19mode
     - rvm: ruby-head

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## 0.0.2
+
+* Support tar cookbook archives in addition to targz cookbook archives.
+
 ## 0.0.1
 
 * Extract the chef adapter to its own gem.

data/README.md

@@ -35,7 +35,7 @@ to manage them.
 
 ### The Cheffile
 
-Every infrastruture repository that uses Librarian-Chef will have a file named
+Every infrastructure repository that uses Librarian-Chef will have a file named
 `Cheffile` in the root directory of that repository. The full specification for
 which third-party, publicly-released cookbooks your infrastructure repository
 depends will go here.
@@ -140,7 +140,7 @@ Prepare your infrastructure repository:
 Librarian-Chef takes over your `cookbooks/` directory, and will always reinstall
 the cookbooks listed the `Cheffile.lock` into your `cookbooks/` directory. Hence
 you do not need your `cookbooks/` directory to be tracked in Git. If you
-nevertheless want your `cookbooks/` directory to be tracked in Git, simple don't
+nevertheless want your `cookbooks/` directory to be tracked in Git, simply don't
 `.gitignore` the directory.
 
 If you are manually tracking/vendoring outside cookbooks within the repository,

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

@@ -250,6 +250,46 @@ module Librarian
             path.open("wb"){|f| f.write(bytes)}
           end
 
+          def path_detect_gzip?(path)
+            Zlib::GzipReader.open(path) { true }
+          rescue Zlib::GzipFile::Error
+            false
+          end
+
+          def path_detect_tar?(path)
+            path_read_bytes_at(path, 257, 8) == "ustar\x0000"
+          end
+
+          def path_read_bytes_at(path, pos, len)
+            path = Pathname(path)
+            path.stat.size >= pos + len or return
+            path.open "rb" do |f|
+              f.seek pos ; f.pos == pos or return
+              f.read(len)
+            end
+          end
+
+          def extract_archive!(source, destination)
+            source = Pathname(source)
+            destination = Pathname(destination)
+
+            return extract_archive_targz! source, destination if path_detect_gzip?(source)
+            return extract_archive_tar! source, destination if path_detect_tar?(source)
+            raise "Unrecognized archive format!"
+          end
+
+          def extract_archive_targz!(source, destination)
+            Zlib::GzipReader.open(source) do |input|
+              Archive::Tar::Minitar.unpack(input, destination.to_s)
+            end
+          end
+
+          def extract_archive_tar!(source, destination)
+            source.open "rb" do |input|
+              Archive::Tar::Minitar.unpack(input, destination.to_s)
+            end
+          end
+
           def unpack_package!(path, source)
             path = Pathname(path)
             source = Pathname(source)
@@ -258,9 +298,7 @@ module Librarian
             temp.mkpath
 
             debug { "Unpacking #{relative_path_to(source)} to #{relative_path_to(temp)}" }
-            Zlib::GzipReader.open(source) do |input|
-              Archive::Tar::Minitar.unpack(input, temp.to_s)
-            end
+            extract_archive! source, temp
 
             # Cookbook files, as pulled from Opscode Community Site API, are
             # embedded in a subdirectory of the tarball. If created by git archive they

data/lib/librarian/chef/version.rb

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

data/librarian-chef.gemspec

@@ -8,9 +8,10 @@ Gem::Specification.new do |gem|
   gem.version       = Librarian::Chef::VERSION
   gem.authors       = ["Jay Feldblum"]
   gem.email         = ["y_feldblum@yahoo.com"]
-  gem.description   = %q{Librarian::Chef}
-  gem.summary       = %q{Librarian::Chef}
+  gem.summary       = %q{A Bundler for your Chef Cookbooks.}
+  gem.description   = %q{A Bundler for your Chef Cookbooks.}
   gem.homepage      = ""
+  gem.license       = "MIT"
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

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

@@ -7,6 +7,8 @@ require 'librarian/helpers'
 require 'librarian/chef'
 require 'librarian/linter/source_linter'
 
+require 'support/project_path'
+
 module Librarian
   module Chef
     module Source
@@ -14,67 +16,16 @@ module Librarian
 
         include WebMock::API
 
-        let(:project_path) do
-          project_path = Pathname.new(__FILE__).expand_path
-          project_path = project_path.dirname until project_path.join("Rakefile").exist?
-          project_path
-        end
+        let(:project_path) { ::Support::ProjectPath.project_path }
         let(:tmp_path) { project_path.join("tmp/spec/functional/chef/source/site") }
         after { tmp_path.rmtree if tmp_path && tmp_path.exist? }
-        let(:sample_path) { tmp_path.join("sample") }
-        let(:sample_metadata) do
-          Helpers.strip_heredoc(<<-METADATA)
-            version "0.6.5"
-          METADATA
-        end
 
         let(:api_url) { "http://site.cookbooks.com" }
 
-        let(:sample_index_data) do
-          {
-            "name" => "sample",
-            "versions" => [
-              "#{api_url}/cookbooks/sample/versions/0_6_5"
-            ]
-          }
-        end
-        let(:sample_0_6_5_data) do
-          {
-            "version" => "0.6.5",
-            "file" => "#{api_url}/cookbooks/sample/versions/0_6_5/file.tar.gz"
-          }
-        end
-        let(:sample_0_6_5_package) do
-          s = StringIO.new
-          z = Zlib::GzipWriter.new(s, Zlib::NO_COMPRESSION)
-          t = Archive::Tar::Minitar::Output.new(z)
-          t.tar.add_file_simple("sample/metadata.rb", :mode => 0700,
-            :size => sample_metadata.bytesize){|io| io.write(sample_metadata)}
-          t.close
-          z.close unless z.closed?
-          s.string
-        end
-
-        # depends on repo_path being defined in each context
-        let(:env) { Environment.new(:project_path => repo_path) }
-
-        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_0_6_5_package)
-        end
-
-        after do
-          WebMock.reset!
-        end
+        let(:repo_path) { tmp_path.join("repo") }
+        let(:env) { repo_path.mkpath ; Environment.new(:project_path => repo_path) }
 
-        let(:repo_path) { tmp_path.join("methods") }
-        before { repo_path.mkpath }
+        after { WebMock.reset! }
 
         describe "lint" do
           it "lints" do
@@ -119,6 +70,49 @@ module Librarian
         end
 
         describe "instance methods" do
+
+          let(:sample_metadata) do
+            Helpers.strip_heredoc(<<-METADATA)
+              version "0.6.5"
+            METADATA
+          end
+
+          let(:sample_index_data) do
+            {
+              "name" => "sample",
+              "versions" => [
+                "#{api_url}/cookbooks/sample/versions/0_6_5"
+              ]
+            }
+          end
+          let(:sample_0_6_5_data) do
+            {
+              "version" => "0.6.5",
+              "file" => "#{api_url}/cookbooks/sample/versions/0_6_5/file.tar.gz"
+            }
+          end
+          let(:sample_0_6_5_package) do
+            s = StringIO.new
+            z = Zlib::GzipWriter.new(s, Zlib::NO_COMPRESSION)
+            t = Archive::Tar::Minitar::Output.new(z)
+            t.tar.add_file_simple("sample/metadata.rb", :mode => 0700,
+              :size => sample_metadata.bytesize){|io| io.write(sample_metadata)}
+            t.close
+            z.close unless z.closed?
+            s.string
+          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_0_6_5_package)
+          end
+
           let(:source) { described_class.new(env, api_url) }
 
           describe "#manifests" do
@@ -203,6 +197,37 @@ module Librarian
         describe "following http redirects" do
           let(:source) { described_class.new(env, api_url) }
 
+          let(:sample_metadata) do
+            Helpers.strip_heredoc(<<-METADATA)
+              version "0.6.5"
+            METADATA
+          end
+
+          let(:sample_index_data) do
+            {
+              "name" => "sample",
+              "versions" => [
+                "#{api_url}/cookbooks/sample/versions/0_6_5"
+              ]
+            }
+          end
+          let(:sample_0_6_5_data) do
+            {
+              "version" => "0.6.5",
+              "file" => "#{api_url}/cookbooks/sample/versions/0_6_5/file.tar.gz"
+            }
+          end
+          let(:sample_0_6_5_package) do
+            s = StringIO.new
+            z = Zlib::GzipWriter.new(s, Zlib::NO_COMPRESSION)
+            t = Archive::Tar::Minitar::Output.new(z)
+            t.tar.add_file_simple("sample/metadata.rb", :mode => 0700,
+              :size => sample_metadata.bytesize){|io| io.write(sample_metadata)}
+            t.close
+            z.close unless z.closed?
+            s.string
+          end
+
           def redirect_to(url)
             {:status => 302, :headers => {"Location" => url}}
           end
@@ -215,6 +240,12 @@ module Librarian
                 to_return redirect_to "#{api_url}/cookbooks/sample-2"
               stub_request(:get, "#{api_url}/cookbooks/sample-2").
                 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_0_6_5_package)
             end
 
             it "follows a sequence of redirects" do
@@ -260,6 +291,59 @@ module Librarian
           end
         end
 
+        describe "extracting .tar packages" do
+          let(:source) { described_class.new(env, api_url) }
+
+          let(:sample_metadata) do
+            Helpers.strip_heredoc(<<-METADATA)
+              version "0.6.5"
+            METADATA
+          end
+
+          let(:sample_index_data) do
+            {
+              "name" => "sample",
+              "versions" => [
+                "#{api_url}/cookbooks/sample/versions/0_6_5"
+              ]
+            }
+          end
+          let(:sample_0_6_5_data) do
+            {
+              "version" => "0.6.5",
+              "file" => "#{api_url}/cookbooks/sample/versions/0_6_5/file.tar"
+            }
+          end
+          let(:sample_0_6_5_package) do
+            s = StringIO.new
+            t = Archive::Tar::Minitar::Output.new(s)
+            t.tar.add_file_simple("sample/metadata.rb", :mode => 0700,
+              :size => sample_metadata.bytesize){|io| io.write(sample_metadata)}
+            t.close
+            s.string
+          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").
+              to_return(:body => sample_0_6_5_package)
+          end
+
+          it "installs the manifest" do
+            env.install_path.mkpath
+            manifest = source.manifests("sample").first
+            source.install!(manifest)
+            text = env.install_path.join("sample/metadata.rb").read
+            text.should == sample_metadata
+          end
+
+        end
+
       end
     end
   end

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

@@ -9,16 +9,14 @@ require 'librarian/action/install'
 require 'librarian/action/update'
 require 'librarian/chef'
 
+require 'support/project_path'
+
 module Librarian
   module Chef
     module Source
       describe Git do
 
-        let(:project_path) do
-          project_path = Pathname.new(__FILE__).expand_path
-          project_path = project_path.dirname until project_path.join("Rakefile").exist?
-          project_path
-        end
+        let(:project_path) { ::Support::ProjectPath.project_path }
         let(:tmp_path) { project_path.join("tmp/spec/integration/chef/source/git") }
         after { tmp_path.rmtree if tmp_path && tmp_path.exist? }
 

data/spec/integration/chef/source/site_spec.rb

@@ -8,6 +8,8 @@ require 'librarian/action/resolve'
 require 'librarian/action/install'
 require 'librarian/chef'
 
+require 'support/project_path'
+
 module Librarian
   module Chef
     module Source
@@ -15,11 +17,7 @@ module Librarian
 
         include WebMock::API
 
-        let(:project_path) do
-          project_path = Pathname.new(__FILE__).expand_path
-          project_path = project_path.dirname until project_path.join("Rakefile").exist?
-          project_path
-        end
+        let(:project_path) { ::Support::ProjectPath.project_path }
         let(:tmp_path) { project_path.join("tmp/spec/integration/chef/source/site") }
         after { tmp_path.rmtree if tmp_path && tmp_path.exist? }
         let(:sample_path) { tmp_path.join("sample") }

data/spec/support/project_path.rb

@@ -0,0 +1,27 @@
+module Support
+  module ProjectPath
+
+    project_path = Pathname.new(__FILE__).expand_path
+    project_path = project_path.dirname until project_path.join("Rakefile").exist?
+    project_path
+
+    PROJECT_PATH = project_path
+
+    def project_path
+      PROJECT_PATH
+    end
+
+    module ClassMethods
+      def project_path
+        PROJECT_PATH
+      end
+    end
+
+    def self.included(base)
+      base.extend ClassMethods
+    end
+
+    extend self
+
+  end
+end

metadata

@@ -1,113 +1,100 @@
 --- !ruby/object:Gem::Specification
 name: librarian-chef
 version: !ruby/object:Gem::Version
-  prerelease: 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Jay Feldblum
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-03 00:00:00.000000000 Z
+date: 2013-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.1.0
   name: librarian
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.1.0
-- !ruby/object:Gem::Dependency
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: 0.1.0
+- !ruby/object:Gem::Dependency
   name: chef
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0.10'
-- !ruby/object:Gem::Dependency
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: '0.10'
+- !ruby/object:Gem::Dependency
   name: archive-tar-minitar
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.5.2
-- !ruby/object:Gem::Dependency
-  type: :development
+  type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.2
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
   name: webmock
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Librarian::Chef
+description: A Bundler for your Chef Cookbooks.
 email:
 - y_feldblum@yahoo.com
 executables:
@@ -145,38 +132,34 @@ files:
 - spec/functional/chef/source/site_spec.rb
 - spec/integration/chef/source/git_spec.rb
 - spec/integration/chef/source/site_spec.rb
+- spec/support/project_path.rb
 homepage: ''
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      segments:
-      - 0
-      hash: 4422248623382062472
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      segments:
-      - 0
-      hash: 4422248623382062472
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.1.3
 signing_key: 
-specification_version: 3
-summary: Librarian::Chef
+specification_version: 4
+summary: A Bundler for your Chef Cookbooks.
 test_files:
 - spec/functional/chef/cli_spec.rb
 - spec/functional/chef/source/site_spec.rb
 - spec/integration/chef/source/git_spec.rb
 - spec/integration/chef/source/site_spec.rb
+- spec/support/project_path.rb