librarian-puppet-simple 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33dc024addb0747f166e4da821892d273cfd784e
-  data.tar.gz: e3b07856ddc4fb3fc17f27c9157e259d95063ff3
+  metadata.gz: f58631425b926315afa614b8ce03aa0b7624cf2c
+  data.tar.gz: 1cef5b57b773f3144f45023135f1e377f9da5ab6
 SHA512:
-  metadata.gz: c8b79b90a48e34b632bde747395dedd7093803fec5b28cde88b2d8a56b8ff25ce9c63da45f5bf8749180f1a4a6c172613ee9e659631ceb1f1418dbed62b98804
-  data.tar.gz: 6f91e8c5f020d6888c13e4c65e1abee793cb17f428a5448ac68cd60c7ad67ac4bef9afb0fcfbecaff3e7a01a308538c44736127e2c9dc93c4006dd37f8f6ec29
+  metadata.gz: 4faf4128ef7afee2111b8d55808ea4eec47a5238e1d312fdcacfc3229dd9f9226e31ed2fe97db7fd9dd44ad9e16b7b9e3a5067bf49218cfccb6f2d452e55833d
+  data.tar.gz: 87072db0e6f498cc160c422eada82136bc6297aac4e35edbbd59ddc54779fd92dadbd0f0e327cf388b428d45fd71962cd6a7a0f17273b1736ba803f31f3ea298

data/LICENSE

@@ -1 +1,13 @@
-Apache License 2.0
+   Copyright 2013-2014 Dan Bode
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

data/lib/librarian/puppet/simple/cli.rb

@@ -44,16 +44,16 @@ module Librarian
           eval(File.read(File.expand_path(options[:puppetfile])))
           each_module_of_type(:git) do |repo|
             Dir.chdir(File.join(module_path, repo[:name])) do
+              remote = repo[:git]
               # if no ref is given, assume master
-              if repo[:ref] == nil
-                checkout_ref  = 'origin/master'
-                remote_branch = 'master'
-              else
-                checkout_ref  = repo[:ref]
-                remote_branch = repo[:ref].gsub(/^origin\//, '')
+              branch = repo[:ref] || 'master'
+              if branch =~ /^origin\/(.*)$/
+                branch = $1
               end
-              print_verbose "\n\n#{repo[:name]} -- git fetch origin && git checkout #{checkout_ref}"
-              git_pull_cmd = system_cmd("git fetch origin && git checkout #{checkout_ref}")
+              co_cmd     = 'git checkout FETCH_HEAD'
+              update_cmd = "git fetch #{repo[:git]} #{branch} && #{co_cmd}"
+              print_verbose "\n\n#{repo[:name]} -- #{update_cmd}"
+              git_pull_cmd = system_cmd(update_cmd)
             end
           end
         end

data/lib/librarian/puppet/simple/iterator.rb

@@ -13,14 +13,14 @@ module Librarian
 
           case
           when options[:git]
-            @modules[:git] ||= []
-            @modules[:git].push(options.merge(:name => module_name, :full_name => full_name))
+            @modules[:git] ||= {}
+            @modules[:git][module_name] = options.merge(:name => module_name, :full_name => full_name)
           when options[:tarball]
-            @modules[:tarball] ||= []
-            @modules[:tarball].push(options.merge(:name => module_name, :full_name => full_name))
+            @modules[:tarball] ||= {}
+            @modules[:tarball][module_name] = options.merge(:name => module_name, :full_name => full_name)
           else
-            @modules[:forge] ||= []
-            @modules[:forge].push(options.merge(:name => module_name, :full_name => full_name))
+            @modules[:forge] ||= {}
+            @modules[:forge][module_name] = options.merge(:name => module_name, :full_name => full_name)
             #abort('only the :git and :tarball providers are currently supported')
           end
         end
@@ -36,7 +36,7 @@ module Librarian
         # iterate through all modules
         def each_module(&block)
           (@modules || {}).each do |type, repos|
-            (repos || []).each do |repo|
+            (repos || {}).values.each do |repo|
               yield repo
             end
           end
@@ -45,7 +45,7 @@ module Librarian
         # loop over each module of a certain type
         def each_module_of_type(type, &block)
           abort("undefined type #{type}") unless [:git, :tarball].include?(type)
-          ((@modules || {})[type] || []).each do |repo|
+          ((@modules || {})[type] || {}).values.each do |repo|
             yield repo
           end
         end

data/lib/librarian/puppet/simple/version.rb

@@ -1,7 +1,7 @@
 module Librarian
   module Puppet
     module Simple
-      VERSION = "0.0.3"
+      VERSION = "0.0.4"
     end
   end
 end

data/spec/functional/install_spec.rb

@@ -35,14 +35,14 @@ describe "Functional - Install" do
       output, status = execute_captured("bin/librarian-puppet install --path=#{temp_directory} --puppetfile=spec/fixtures/Puppetfile")
 
       status.should == 0
-      Dir.entries(temp_directory).should =~ ['.', '..', 'apache', 'ntp', 'trashfile']
+      Dir.entries(temp_directory).should =~ %w|. .. apache ntp trashfile dnsclient testlps|
     end
 
     it "with --clean it cleans the directory before installing the modules in a temp directory" do
       output, status = execute_captured("bin/librarian-puppet install --clean --path=#{temp_directory} --puppetfile=spec/fixtures/Puppetfile")
 
       status.should == 0
-      Dir.entries(temp_directory).should =~ ['.', '..', 'apache', 'ntp']
+      Dir.entries(temp_directory).should =~ %w|. .. apache ntp dnsclient testlps|
     end
 
     it "with --verbose it outputs progress messages" do
@@ -66,9 +66,8 @@ describe "Functional - Install" do
         output, status = execute_captured("bin/librarian-puppet install --verbose --path=#{temp_directory} --puppetfile=spec/fixtures/Puppetfile")
         status.should == 0
         output.should include('Module apache already installed')
-        Dir.entries(temp_directory).should =~ ['.', '..', 'apache', 'ntp']
+        Dir.entries(temp_directory).should =~ %w|. .. apache ntp dnsclient testlps|
       end
-
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: librarian-puppet-simple
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Dan Bode
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-24 00:00:00.000000000 Z
+date: 2015-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -84,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Bundler for your Puppet modules