berkshelf-shims 0.1.2 → 0.2.0

data/Gemfile.lock

@@ -1,11 +1,47 @@
 PATH
   remote: .
   specs:
-    berkshelf-shims (0.1.1)
+    berkshelf-shims (0.2.0)
+      berkshelf (< 3.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    activesupport (3.2.13)
+      i18n (= 0.6.1)
+      multi_json (~> 1.0)
+    addressable (2.3.5)
+    akami (1.2.0)
+      gyoku (>= 0.4.0)
+      nokogiri (>= 1.4.0)
+    berkshelf (2.0.7)
+      activesupport (~> 3.2.0)
+      addressable (~> 2.3.4)
+      buff-shell_out (~> 0.1)
+      celluloid (>= 0.14.0)
+      chozo (>= 0.6.1)
+      faraday (>= 0.8.5)
+      hashie (>= 2.0.2)
+      minitar (~> 0.5.4)
+      rbzip2 (~> 0.2.0)
+      retryable (~> 1.3.3)
+      ridley (~> 1.2.1)
+      solve (>= 0.5.0)
+      thor (~> 0.18.0)
+    buff-extensions (0.5.0)
+    buff-ruby_engine (0.1.0)
+    buff-shell_out (0.1.0)
+      buff-ruby_engine (~> 0.1.0)
+    builder (3.2.2)
+    celluloid (0.14.1)
+      timers (>= 1.0.0)
+    celluloid-io (0.14.1)
+      celluloid (>= 0.14.1)
+      nio4r (>= 0.4.5)
+    chozo (0.6.1)
+      activesupport (>= 3.2.0)
+      hashie (>= 2.0.2)
+      multi_json (>= 1.3.0)
     columnize (0.3.6)
     debugger (1.5.0)
       columnize (>= 0.3.1)
@@ -14,8 +50,55 @@ GEM
     debugger-linecache (1.2.0)
     debugger-ruby_core_source (1.2.0)
     diff-lcs (1.1.3)
+    erubis (2.7.0)
+    faraday (0.8.7)
+      multipart-post (~> 1.1)
+    ffi (1.9.0)
+    gssapi (1.0.3)
+      ffi (>= 1.0.1)
+    gyoku (1.0.0)
+      builder (>= 2.1.2)
+    hashie (2.0.5)
+    httpclient (2.2.0.2)
+    httpi (0.9.7)
+      rack
+    i18n (0.6.1)
+    json (1.8.0)
+    little-plugger (1.1.3)
+    logging (1.6.2)
+      little-plugger (>= 1.1.3)
+    minitar (0.5.4)
+    mixlib-authentication (1.3.0)
+      mixlib-log
+    mixlib-log (1.6.0)
     multi_json (1.6.1)
+    multipart-post (1.2.0)
+    net-http-persistent (2.8)
+    net-ssh (2.6.8)
+    nio4r (0.4.6)
+    nokogiri (1.5.10)
+    nori (1.1.5)
+    rack (1.5.2)
     rake (10.0.3)
+    rbzip2 (0.2.0)
+    retryable (1.3.3)
+    ridley (1.2.4)
+      addressable
+      buff-extensions (~> 0.3)
+      buff-shell_out (~> 0.1)
+      celluloid (~> 0.14.0)
+      celluloid-io (~> 0.14.0)
+      erubis
+      faraday (>= 0.8.4)
+      hashie (>= 2.0.2)
+      json (>= 1.7.7)
+      mixlib-authentication (>= 1.3.0)
+      net-http-persistent (>= 2.8)
+      net-ssh
+      retryable
+      solve (>= 0.4.4)
+      varia_model (~> 0.1)
+      winrm (~> 1.1.0)
     rspec (2.12.0)
       rspec-core (~> 2.12.0)
       rspec-expectations (~> 2.12.0)
@@ -24,10 +107,36 @@ GEM
     rspec-expectations (2.12.1)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.12.1)
+    rubyntlm (0.1.1)
+    savon (0.9.5)
+      akami (~> 1.0)
+      builder (>= 2.1.2)
+      gyoku (>= 0.4.0)
+      httpi (~> 0.9)
+      nokogiri (>= 1.4.0)
+      nori (~> 1.0)
+      wasabi (~> 1.0)
     simplecov (0.7.1)
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
+    solve (0.6.1)
+    thor (0.18.1)
+    timers (1.1.0)
+    uuidtools (2.1.4)
+    varia_model (0.1.1)
+      buff-extensions (~> 0.2)
+      hashie (>= 2.0.2)
+    wasabi (1.0.0)
+      nokogiri (>= 1.4.0)
+    winrm (1.1.2)
+      gssapi (~> 1.0.0)
+      httpclient (~> 2.2.0.2)
+      logging (~> 1.6.1)
+      nokogiri (~> 1.5.0)
+      rubyntlm (~> 0.1.1)
+      savon (= 0.9.5)
+      uuidtools (~> 2.1.2)
 
 PLATFORMS
   ruby

data/berkshelf-shims.gemspec

@@ -17,4 +17,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
+  #berkshelf-shims works with berkshelf 1 and berkshelf 2 Gemfile.locks.
+  #we only use berkshelf code for reading the 2.0 file.
+  gem.add_runtime_dependency 'berkshelf', '< 3.0'
 end

data/lib/berkshelf-shims.rb

@@ -1,3 +1,5 @@
+require 'json'
+
 module BerkshelfShims
 
   class UnknownCookbookReferenceError < StandardError
@@ -18,6 +20,28 @@ module BerkshelfShims
         object = new
         object.load(content)
       end
+
+      def from_lockfile(lockfile)
+        object = new
+        lockfile.load!
+        lockfile.sources.each do |source|
+          description = {}
+          description[:locked_version] = source.locked_version
+          if source.location
+            location = source.location
+            if location.class.location_key == :git
+              description[:git] = location.uri
+              description[:ref] = location.ref
+            elsif location.class.location_key == :path
+              description[:path] = location.path
+            else
+              raise "unknown location type #{location.class.location_key}"
+            end
+          end
+          object.cookbooks[source.name] = description
+        end
+        object
+      end
     end
 
     attr_reader :cookbooks
@@ -59,7 +83,28 @@ module BerkshelfShims
 
   def self.create_shims(root, path=nil)
     path ||= berkshelf_path
-    BerksLockFile::from_file("#{root}/Berksfile.lock").create_links("#{root}/cookbooks", path)
+
+    if running_berkshelf2? && b2_berksfile?(root)
+      berksfile = Berkshelf::Berksfile.new("#{root}/Berksfile")
+      berks_lockfile = Berkshelf::Lockfile.new(berksfile)
+      lockfile = BerksLockFile::from_lockfile(berks_lockfile)
+    else
+      lockfile = BerksLockFile::from_file("#{root}/Berksfile.lock")
+    end
+    lockfile.create_links("#{root}/cookbooks", path)
+  end
+
+  def self.running_berkshelf2?
+    require 'berkshelf'
+    Berkshelf::VERSION.split('.').first > '1'
   end
 
+  def self.b2_berksfile? path
+    begin
+      h = JSON.parse(File.read("#{path}/Berksfile.lock"))
+      true
+    rescue Exception => e
+      false
+    end
+  end
 end

data/lib/berkshelf-shims/version.rb

@@ -1,5 +1,5 @@
 module WP
   module Cookbook
-    VERSION = "0.1.2"
+    VERSION = "0.2.0"
   end
 end

data/spec/berkshelf_shims_spec.rb

@@ -1,3 +1,5 @@
+require 'json'
+
 describe BerkshelfShims do
   describe '#berkshelf_path' do
     subject {BerkshelfShims.berkshelf_path}
@@ -18,32 +20,34 @@ describe BerkshelfShims do
     end
   end
 
-  describe '#create_shims' do
-    let(:test_dir) {'tmp'}
+  shared_examples 'berkshelf examples' do
+    let(:test_dir) {File.expand_path(File.join(File.dirname(__FILE__), '../tmp'))}
     let(:lock_file) {"#{test_dir}/Berksfile.lock"}
     let(:cookbooks_dir) {"#{test_dir}/cookbooks"}
     let(:relative_target_dir) {File.expand_path("#{test_dir}/relative")}
-
     before do
-      FileUtils.rm_rf(test_dir)
-      FileUtils.mkdir(test_dir)
-      File.open(lock_file, 'w') do |f|
-        cookbook_entries.each do |line|
-          f.puts line
-        end
+      Dir.mkdir(relative_target_dir)
+      File.open(File.join(relative_target_dir, "metadata.rb"), 'w') do |f|
+        f.write('name "relative"')
       end
     end
+
     context 'with a normal input' do
       let(:cookbook_entries) {[
                                "cookbook 'relative', :path => '#{relative_target_dir}'",
                                "cookbook 'versioned', :locked_version => '0.0.1'",
                                "cookbook 'somegitrepo', :git => 'http://github.com/someuser/somegitrepo.git', :ref => '6ffb9cf5ddee65b8c208dec5c7b1ca9a4259b86a'"
                               ]}
+      let(:v2_cookbook_entries) {{
+          #Still converting these entries 2.0 format.
+          'relative' => {:path => "#{relative_target_dir}"},
+          'versioned' => {:locked_version => '0.0.1'},
+          'somegitrepo' => {:git => 'http://github.com/someuser/somegitrepo.git', :ref => '6ffb9cf5ddee65b8c208dec5c7b1ca9a4259b86a'}
+        }}
 
       context 'with the default berkshelf path' do
         before do
-          Dir.mkdir(relative_target_dir)
-          BerkshelfShims::create_shims('tmp')
+          BerkshelfShims::create_shims(test_dir)
         end
         it 'creates the links' do
           Dir.exists?(cookbooks_dir).should == true
@@ -51,11 +55,10 @@ describe BerkshelfShims do
           File.readlink("#{cookbooks_dir}/relative").should == relative_target_dir
           File.readlink("#{cookbooks_dir}/versioned").should == "#{BerkshelfShims.berkshelf_path}/cookbooks/versioned-0.0.1"
           File.readlink("#{cookbooks_dir}/somegitrepo").should == "#{BerkshelfShims.berkshelf_path}/cookbooks/somegitrepo-6ffb9cf5ddee65b8c208dec5c7b1ca9a4259b86a"
-          Dir["#{relative_target_dir}/*"].should == []
         end
         context 'run a second time' do
           before do
-            BerkshelfShims::create_shims('tmp')
+            BerkshelfShims::create_shims(test_dir)
           end
           it 'creates the links' do
             Dir.exists?(cookbooks_dir).should == true
@@ -63,14 +66,13 @@ describe BerkshelfShims do
             File.readlink("#{cookbooks_dir}/relative").should == relative_target_dir
             File.readlink("#{cookbooks_dir}/versioned").should == "#{BerkshelfShims.berkshelf_path}/cookbooks/versioned-0.0.1"
             File.readlink("#{cookbooks_dir}/somegitrepo").should == "#{BerkshelfShims.berkshelf_path}/cookbooks/somegitrepo-6ffb9cf5ddee65b8c208dec5c7b1ca9a4259b86a"
-            Dir["#{relative_target_dir}/*"].should == []
           end
       end
       end
 
       context 'with an explicit berkshelf path' do
         before do
-          BerkshelfShims::create_shims('tmp', 'berkshelf')
+          BerkshelfShims::create_shims(test_dir, 'berkshelf')
         end
         it 'creates the links' do
           Dir.exists?(cookbooks_dir).should == true
@@ -83,15 +85,15 @@ describe BerkshelfShims do
 
       context 'with an environent variable' do
         before do
-          ENV[BerkshelfShims::BERKSHELF_PATH_ENV] = '/berkshelf_env'
-          BerkshelfShims::create_shims('tmp')
+          ENV[BerkshelfShims::BERKSHELF_PATH_ENV] = "#{test_dir}/berkshelf_env"
+          BerkshelfShims::create_shims(test_dir)
         end
         it 'creates the links' do
           Dir.exists?(cookbooks_dir).should == true
           Dir["#{cookbooks_dir}/*"].sort.should == ["#{cookbooks_dir}/relative", "#{cookbooks_dir}/somegitrepo", "#{cookbooks_dir}/versioned"]
           File.readlink("#{cookbooks_dir}/relative").should == relative_target_dir
-          File.readlink("#{cookbooks_dir}/versioned").should == "/berkshelf_env/cookbooks/versioned-0.0.1"
-          File.readlink("#{cookbooks_dir}/somegitrepo").should == "/berkshelf_env/cookbooks/somegitrepo-6ffb9cf5ddee65b8c208dec5c7b1ca9a4259b86a"
+          File.readlink("#{cookbooks_dir}/versioned").should == "#{test_dir}/berkshelf_env/cookbooks/versioned-0.0.1"
+          File.readlink("#{cookbooks_dir}/somegitrepo").should == "#{test_dir}/berkshelf_env/cookbooks/somegitrepo-6ffb9cf5ddee65b8c208dec5c7b1ca9a4259b86a"
         end
       end
     end
@@ -100,9 +102,36 @@ describe BerkshelfShims do
       let(:cookbook_entries) {[
                                "cookbook 'relative'"
                               ]}
+      let(:v2_cookbook_entries) {{
+          'relative' => {}
+        }}
       it 'throws an error' do
-        expect {BerkshelfShims::create_shims('tmp')}.to raise_error BerkshelfShims::UnknownCookbookReferenceError
+        expect {BerkshelfShims::create_shims(test_dir)}.to raise_error BerkshelfShims::UnknownCookbookReferenceError
+      end
+    end
+  end
+
+  describe 'Berkshelf 1.0 format' do
+    before do
+      FileUtils.rm_rf(test_dir)
+      FileUtils.mkdir(test_dir)
+      File.open(lock_file, 'w') do |f|
+        cookbook_entries.each do |line|
+          f.puts line
+        end
+      end
+    end
+    include_examples 'berkshelf examples'
+  end
+
+  describe 'Berkshelf 2.0 format' do
+    before do
+      FileUtils.rm_rf(test_dir)
+      FileUtils.mkdir(test_dir)
+      File.open(lock_file, 'w') do |f|
+        f.write(JSON.dump({:sources => v2_cookbook_entries}))
       end
     end
+    include_examples 'berkshelf examples'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf-shims
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-16 00:00:00.000000000 Z
-dependencies: []
+date: 2013-08-22 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: berkshelf
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - <
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - <
+      - !ruby/object:Gem::Version
+        version: '3.0'
 description: Shim functionality for Berkshelf
 email:
 - bellegar@gmail.com
@@ -43,12 +59,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4266870366331531644
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4266870366331531644
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23