berks-monolith 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e00e4691862cc03e4cca97a0722ad297e535391
-  data.tar.gz: 4183cdf8be169fc1b52c22f83e9f0fb4c8d49115
+  metadata.gz: 5850a377e166641ecfdefc6eb15bee7f5a6ccfee
+  data.tar.gz: 44386e6b7dd0491a984fa9adae7289b3e75f91ba
 SHA512:
-  metadata.gz: caf6a7a55dd3b38d1e6fde05e7df7efddd6f6c8aa247af5b835aad685d455db71015cda82e1d2d9046cf84ae24d3b8340941be58973afff3a1f095dd9eb79496
-  data.tar.gz: 82ff7940b2e02d68125bc479c40a2c27f06af2d712bc00b4d367d6a49588e8f8be28da8d40e7eaca5b9429901785a067baeffe174535adc0af8d05cd6f968fce
+  metadata.gz: 7517d54a444eaadf6f8b3997ec85f3ee114f065479043bc35d1c1a77f54be6473e271d2383e4ca84fa8d6f2d245f1b53ea6c127bdd5388809919048a5eb4fab5
+  data.tar.gz: 7c0dd2f7b722402b417696c18653920d66fa612e2447cf040528e42c700984df8af9d332cc1ef13643010a987af3e5e0cc8deedcde6046c01eb40ec20e78205f

data/README.md

@@ -33,6 +33,16 @@ The `berks install` command collects all cookbooks into
 `~/.berkshelf/cookbooks`, but again VCS information is stripped out, and this
 contains all cookbooks, not just those associated with a specific Berksfile.
 
+# Installation
+
+Install from rubygems:
+
+    gem install berks-monolith
+
+Or to install the development version from a git clone:
+
+    rake install
+
 ## Usage
 
 ### berks-monolith install

data/lib/monolith/commands.rb

@@ -42,8 +42,9 @@ module Monolith
       gitpath = File.expand_path('../.git', berksfile.berksfile.filepath)
       gitexclude = GitExclude.new(gitpath, options)
       berksfile.cookbooks(path) do |cookbook, dep, destination|
-        berksfile.monolith_action(:install, cookbook, dep, destination)
-        gitexclude.add(destination)
+        changed = berksfile.monolith_action(:install, cookbook, dep, destination)
+
+        gitexclude.add(destination) if changed
       end
       gitexclude.update
     end
@@ -62,8 +63,8 @@ module Monolith
       gitpath = File.expand_path('../.git', berksfile.berksfile.filepath)
       gitexclude = GitExclude.new(gitpath, options)
       berksfile.cookbooks(path) do |cookbook, dep, destination|
-        berksfile.monolith_action(:clean, cookbook, dep, destination)
-        gitexclude.remove(destination)
+        changed = berksfile.monolith_action(:clean, cookbook, dep, destination)
+        gitexclude.remove(destination) if changed
       end
       gitexclude.update
     end

data/lib/monolith/locations/base.rb

@@ -28,9 +28,11 @@ module Monolith
       if File.exist?(@destination)
         Monolith.formatter.clean(@cookbook, @destination)
         FileUtils.rm_rf(@destination)
+        true
       else
         rel_dest = Monolith.formatter.rel_dir(@destination)
         Monolith.formatter.skip(@cookbook, "#{rel_dest} doesn't exist")
+        nil
       end
     end
   end

data/lib/monolith/locations/default.rb

@@ -12,6 +12,7 @@ module Monolith
         Monolith.formatter.install(@cookbook, @destination)
         FileUtils.cp_r(@cookbook.path, @destination)
       end
+      true
     end
 
     def update
@@ -19,6 +20,7 @@ module Monolith
       # blowing it away and recreating it. For the moment I'm opting not to do
       # that (it may be able ot be an option later)
       Monolith.formatter.skip(@cookbook, "Not updating community cookbook")
+      nil
     end
   end
 end

data/lib/monolith/locations/git.rb

@@ -19,9 +19,11 @@ module Monolith
 
         # Not sure if I want to do this - should probably be an option
         #git %|reset --hard #{@revision}|
+        true
       else
         rel_dest = Monolith.formatter.rel_dir(@destination)
         Monolith.formatter.skip(@cookbook, "#{rel_dest} already exists")
+        nil
       end
     end
 
@@ -31,9 +33,11 @@ module Monolith
         Dir.chdir(@destination) do
           git %|pull|
         end
+        true
       else
         rel_dest = Monolith.formatter.rel_dir(@destination)
         Monolith.formatter.skip(@cookbook, "#{rel_dest} doesn't exist")
+        nil
       end
     end
 

data/lib/monolith/locations/path.rb

@@ -8,16 +8,19 @@ module Monolith
     def install
       Monolith.formatter.debug("Skipping cookbook #{@cookbook.cookbook_name}" \
                                "with path location")
+      nil
     end
 
     def update
       Monolith.formatter.debug("Skipping cookbook #{@cookbook.cookbook_name}" \
                                "with path location")
+      nil
     end
 
     def clean
       Monolith.formatter.debug("Skipping cookbook #{@cookbook.cookbook_name}" \
                                "with path location")
+      nil
     end
   end
 end

data/lib/monolith/version.rb

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

data/test/helpers.rb

@@ -12,6 +12,13 @@ module Monolith
       FileUtils.mkdir_p(tmp_path)
     end
 
+    def setup_tmp_git_repo
+      # Makes the test directory into a git repo for testing excludes
+      Dir.chdir(tmp_path) do
+        %x|git init|
+      end
+    end
+
     def make_git_repo(name)
       # Makes an example git repo with a single file in and one commit
       repo_path = tmp_path.join("git", name)
@@ -41,6 +48,18 @@ module Monolith
       end
     end
 
+    def make_path_cookbook(name)
+      # Makes an example git repo with a single file in and one commit
+      cb_path = tmp_path.join("cookbooks", name)
+      FileUtils.mkdir_p(cb_path)
+      Dir.chdir(cb_path) do
+        File.open('metadata.rb', 'w') do |f|
+          f.puts "name '#{name}'"
+        end
+      end
+      cb_path
+    end
+
     def make_berksfile(types)
       File.open(tmp_path.join('Berksfile'), 'w') do |berksfile|
         berksfile.puts "source 'https://supermarket.chef.io/'"
@@ -48,6 +67,9 @@ module Monolith
           if type == :git
             repo_path = make_git_repo('test_git')
             berksfile.puts("cookbook 'test_git', :git => '#{repo_path}'")
+          elsif type == :path
+            cb_path = make_path_cookbook('test_path')
+            berksfile.puts("cookbook 'test_path', :path => '#{cb_path}'")
           end
         end
       end

data/test/test_gitexclude.rb

@@ -0,0 +1,29 @@
+require 'minitest/autorun'
+require_relative 'helpers'
+
+# Fix 'Celluloid::Error Thread pool is not running' error.
+# See https://github.com/celluloid/celluloid/pull/162
+require 'celluloid/test'
+Celluloid.init
+
+require 'monolith'
+
+class TestCommandInstall < MiniTest::Test
+  include Monolith::TestHelpers
+
+  def setup
+    clean_tmp_path
+    setup_tmp_git_repo
+  end
+
+  def test_install_command
+    efile = ".git/info/exclude"
+    make_berksfile([:git, :path]) do
+      Monolith::Command.start(['install', '-q'])
+      assert File.exist?(efile)
+      assert File.read(efile).include?("cookbooks/test_git")
+      assert File.exist?("cookbooks/test_path")
+      refute File.read(efile).include?("cookbooks/test_path")
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: berks-monolith
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Mark Harrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-02 00:00:00.000000000 Z
+date: 2015-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: berkshelf
@@ -119,6 +119,7 @@ files:
 - test/test_command_clean.rb
 - test/test_command_install.rb
 - test/test_command_update.rb
+- test/test_gitexclude.rb
 - test/test_gitlocation.rb
 homepage: http://github.com/mivok/berks-monolith
 licenses:
@@ -140,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: Berkshelf monolithic repository tools
@@ -150,5 +151,6 @@ test_files:
 - test/test_command_clean.rb
 - test/test_command_install.rb
 - test/test_command_update.rb
+- test/test_gitexclude.rb
 - test/test_gitlocation.rb
 has_rdoc: