berks-monolith 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5850a377e166641ecfdefc6eb15bee7f5a6ccfee
-  data.tar.gz: 44386e6b7dd0491a984fa9adae7289b3e75f91ba
+  metadata.gz: 2467dd678de12d92c13cd15cd01c8446a4287e93
+  data.tar.gz: 3598971b6b6efb4b22ba4dfc9814e3a4ec169182
 SHA512:
-  metadata.gz: 7517d54a444eaadf6f8b3997ec85f3ee114f065479043bc35d1c1a77f54be6473e271d2383e4ca84fa8d6f2d245f1b53ea6c127bdd5388809919048a5eb4fab5
-  data.tar.gz: 7c0dd2f7b722402b417696c18653920d66fa612e2447cf040528e42c700984df8af9d332cc1ef13643010a987af3e5e0cc8deedcde6046c01eb40ec20e78205f
+  metadata.gz: 8c0dda7234dc134eddbdb583af9e8be15d126245f9c44434e1fcc1801f70e0b6e7a7d5263ae94a1a54bfcb84ca4facfa7bd655bebb6f911880fafbeda94b3bdf
+  data.tar.gz: eca5fac133ef4ddf15d52bfb363647eb5d356eeccd4f5925d10f64630d20e449045c14580f8c303fe7e4c06b85865ef5d5281c4c9b4821fb61e1f6e2ce06413f

data/lib/monolith/berksfile.rb

@@ -4,6 +4,7 @@ require 'fileutils'
 module Monolith
   class Berksfile
     attr_reader :berksfile
+    attr_reader :cached_cookbooks
 
     def initialize(options)
       Berkshelf.ui.mute! if Monolith.formatter.quiet
@@ -20,7 +21,7 @@ module Monolith
     # copy. However, it's not needed for other commands, so it separated out
     # here.
     def install
-      @berksfile.install
+      @cached_cookbooks = @berksfile.install
     end
 
     # Retrieve all cookbooks listed in the berksfile.
@@ -28,15 +29,13 @@ module Monolith
     # Can take a block to do something with each cookbook.
     def cookbooks(path)
       FileUtils.mkdir_p(path)
-      cached_cookbooks = @berksfile.cookbooks
+      cached_cookbooks = @cached_cookbooks
       if block_given?
         cached_cookbooks.each do |cookbook|
           destination = File.join(File.expand_path(path),
                                   cookbook.cookbook_name)
           dep = berksfile.get_dependency(cookbook.cookbook_name)
-          if dep
-            yield cookbook, dep, destination
-          end
+          yield cookbook, dep, destination
         end
       end
       cached_cookbooks
@@ -54,7 +53,7 @@ module Monolith
     # Feteches the appropriate monolith location object for a given cookbook
     # dependency. I.e. Monolith::FooLocation.
     def monolith_obj(cookbook, dep, destination)
-      if dep.location.nil?
+      if dep.nil? or dep.location.nil?
         Monolith::DefaultLocation.new(cookbook, dep, destination)
       else
         klass = dep.location.class.name.split('::')[-1]

data/lib/monolith/commands.rb

@@ -2,6 +2,7 @@ require 'thor'
 require 'monolith/berksfile'
 require 'monolith/formatter'
 require 'monolith/gitexclude'
+require 'monolith/version'
 
 module Monolith
   class Command < Thor
@@ -52,6 +53,7 @@ module Monolith
     desc 'update [PATH]', 'Update all cloned cookbooks'
     def update(path = File.join(Dir.pwd, "cookbooks"))
       berksfile = Monolith::Berksfile.new(options.dup)
+      berksfile.install # We need to run berks install first
       berksfile.cookbooks(path) do |cookbook, dep, destination|
         berksfile.monolith_action(:update, cookbook, dep, destination)
       end
@@ -60,6 +62,10 @@ module Monolith
     desc 'clean [PATH]', 'Delete all cloned cookbooks'
     def clean(path = File.join(Dir.pwd, "cookbooks"))
       berksfile = Monolith::Berksfile.new(options.dup)
+      # This is counter-intuitive given we're actually getting rid of the
+      # cookbooks. This performs the dependency resolution needed to work out
+      # what we need to remove.
+      berksfile.install
       gitpath = File.expand_path('../.git', berksfile.berksfile.filepath)
       gitexclude = GitExclude.new(gitpath, options)
       berksfile.cookbooks(path) do |cookbook, dep, destination|
@@ -68,5 +74,10 @@ module Monolith
       end
       gitexclude.update
     end
+
+    desc 'version', 'Print the version of berks-monlith'
+    def version
+      puts Monolith::VERSION
+    end
   end
 end

data/lib/monolith/locations/base.rb

@@ -2,7 +2,7 @@ module Monolith
   class BaseLocation
     def initialize(cookbook, dep, destination)
       @dep = dep
-      @location = dep.location
+      @location = dep.location unless dep.nil?
       @cookbook = cookbook
       @destination = destination
     end

data/lib/monolith/version.rb

@@ -1,3 +1,3 @@
 module Monolith
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/test/helpers.rb

@@ -70,6 +70,13 @@ module Monolith
           elsif type == :path
             cb_path = make_path_cookbook('test_path')
             berksfile.puts("cookbook 'test_path', :path => '#{cb_path}'")
+          elsif type == :nested_community
+            cb_path = make_path_cookbook('test_nested')
+            berksfile.puts("cookbook 'test_nested', :path => '#{cb_path}'")
+            # Note: testmh is an arbitrary cookbook that exists on
+            # supermarket, and could be replaced by any other cookbook as long
+            # as the tests are updated appropriately.
+            add_metadata_dependency(cb_path, 'testmh')
           end
         end
       end
@@ -80,5 +87,13 @@ module Monolith
         end
       end
     end
+
+    def add_metadata_dependency(cookbook_path, cookbook_name)
+      Dir.chdir(cookbook_path) do
+        File.open('metadata.rb', 'a') do |f|
+          f.puts "depends '#{cookbook_name}'"
+        end
+      end
+    end
   end
 end

data/test/test_command_install.rb

@@ -22,4 +22,13 @@ class TestCommandInstall < MiniTest::Test
       assert File.exist?("cookbooks/test_git/.git")
     end
   end
+
+  def test_nested_dependencies
+    make_berksfile([:nested_community]) do
+      Monolith::Command.start(['install', '-q'])
+      assert File.exist?("cookbooks/test_nested")
+      assert File.exist?("cookbooks/test_nested/metadata.rb")
+      assert File.exist?("cookbooks/testmh")
+    end
+  end
 end

data/test/test_gitlocation.rb

@@ -35,6 +35,7 @@ class TestGitLocation < MiniTest::Test
     @mock_cookbook.expect :cookbook_name, @test_cookbook
     @mock_dep = Minitest::Mock.new
     @mock_dep.expect :location, nil
+    @mock_dep.expect :nil?, false
     location = Monolith::GitLocation.new(@mock_cookbook, @mock_dep,
                                          @mock_destination)
     location.stub(:cache_path, @mock_cache) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: berks-monolith
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Mark Harrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-29 00:00:00.000000000 Z
+date: 2015-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: berkshelf