gaptool-client 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9840e7571899e8452f2578e42a75e31712f5bff8
-  data.tar.gz: a2a763ce1fdd09fa2de47cf823fced2678439a5b
+  metadata.gz: f6de8bc33084ec12da1f6fad916b314040c275b8
+  data.tar.gz: d0fb9308219bd92b244369f5af51290639ecc8a9
 SHA512:
-  metadata.gz: 47902849b7ab4e1acbd72f24a130810b8e25e286d51d150451aae8c2a7d645c48be421a900979d3dbd359b48eefd18247d7117ed022e526addeb5d25767da995
-  data.tar.gz: 18fd55fbb61780ea848b51028052c6b271bfe8dcd377373affafb85ffc2481b4274320efbd7ac345973c43bd37e9c1b240fea2b92c291b4aeddb969b23c9d6cd
+  metadata.gz: d8542c48e43566b1c6b4f444e3892ecef315f3a1c230848563d1e1be7e919bd6e946955cae84c91bb11e403b01d5ee2028e52f09610e86241d7f5cb8e50b2376
+  data.tar.gz: 129975c34b7e5a48224f66fdf88551eb26615c7431582f0cdecd15f031d22b54586cc76673a5b31936b2e18e194e1aafbaeafa4841161623fa459baa3ebbc981

data/VERSION

@@ -1 +1 @@
-0.6.1
+0.6.2

data/lib/gaptool-client.rb

@@ -210,6 +210,7 @@ module Gaptool
     option ["-e", "--environment"], "ENVIRONMENT", "Which environment, e.g. production", :required => true
     option ["-i", "--instance"], "INSTANCE", "Instance ID, e.g. i-12345678", :required => false
     option ["-A", "--attribute"], "ATTRIBUTE", "Pass one or more parameters to the deploy recipe in recipe.attr=value format", :multivalued => true
+    option ["-b", "--chef-branch"], "BRANCH", "branch of the chef repository to use (defaults to master)", :default => 'master'
 
     def execute
       attrs = split_attrs(attribute_list)
@@ -229,10 +230,11 @@ module Gaptool
           'instance' => node['instance'],
           'zone' => node['zone'],
           'itype' => node['itype'],
-          'apps' => eval(node['apps'])
+          'apps' => eval(node['apps']),
+          'chefbranch' => chef_branch
         }.merge(attrs).to_json
         commands = [
-          "cd ~admin/ops; git pull",
+          "cd ~admin/ops; git checkout -f #{chef_branch}; git fetch --all; git reset --hard origin/#{chef_branch}",
           "echo '#{json}' > ~admin/solo.json",
           "sudo chef-solo -c ~admin/ops/cookbooks/solo.rb -j ~admin/solo.json"
         ]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gaptool-client
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Francesco Laurita
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-09 00:00:00.000000000 Z
+date: 2014-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json