puppet_pal 0.0.3 → 0.0.4

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2013 Michael Owings
+Copyright (c) 2014 Turbosquid, Inc.
 
 MIT License
 

data/README.md

@@ -34,7 +34,7 @@ specified, then the module is pulled from puppetforge (via a `puppet
 module install` call). 
 
 Otherwise, you may pass the `:git` option to specify a git repo, as well as a `:path`
-option to specify a particular path within that repo.
+and/or `:branch` option to specify a particular path within that repo.
 
 ### forge
 For backward compatibility -- does nothing
@@ -52,7 +52,8 @@ For backward compatibility -- does nothing
       :path=> "modules/base_packages"
     mod 'solr',
       :git => puppet_common_git,
-      :path=> "modules/solr"
+      :path=> "modules/solr",
+      :branch => "develop"
     mod 'mysql',
       :git => puppet_common_git,
       :path=> "modules/mysql"

data/lib/puppet_pal/pal.rb

@@ -39,7 +39,12 @@ module PuppetPal
       working_dir
     end
 
-    def copy_module(name, source_path)
+    def copy_module(name, source_path, branch='master')
+      current_branch = `cd #{source_path} && git symbolic-ref --short HEAD`.strip
+      if current_branch != branch
+        success = system("cd #{source_path} && git checkout #{branch}")
+        raise "git checkout failed" unless success
+      end
       target = File.join(@module_dir,name)
       FileUtils.rm_rf(target)
       FileUtils.cp_r(source_path, target, preserve: true)
@@ -59,9 +64,9 @@ module PuppetPal
     def mod(name, options={})
       puts "Processing module: #{name}"
       if options[:git]
-        working_dir = pull_repo(options[:git])
+        working_dir = pull_repo(options[:git], :git )
         path = options[:path] || ""
-        copy_module(name, File.join(working_dir, path))
+        copy_module(name, File.join(working_dir, path), options[:branch] || 'master')
       else # Assume we are pulling from puppet forge
         pull_from_puppetforge(name)
       end

data/lib/puppet_pal/version.rb

@@ -1,3 +1,3 @@
 module PuppetPal
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppet_pal
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-30 00:00:00.000000000 Z
+date: 2014-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler