gaptool-client 0.6.5 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 958bdddd0b5808f57ff3c95e6ae4c006bb847bdd
-  data.tar.gz: 3f1efc5495f6f6e64648029836532ca0133821fa
+  metadata.gz: dc3b14a0963cfa01b3adb3f7509bd3aedbf2772c
+  data.tar.gz: 3f7f7c6e05f3e5869e520afc2e82490b9f6e7cc0
 SHA512:
-  metadata.gz: 3c0224e2ffa7f3365c5e8d36e8479c1b988a5bd9a7b86b1c1fc93503973dcd14cc22f1d6ddff2d77e577cca84b7262e84f0b338faad94ebf13161f292fc88e97
-  data.tar.gz: 00e5718a8d9149d9c807d70e5f83f96946c07972cd64ffbdc5475c527191347249e95f134abaa9496301dc8c543e35755924315add7233047d293b188af6eb4e
+  metadata.gz: 77915d7bbf67e95bae10f9c1e5da2e18b62cc53c1526c291e339bdee47760e452dd35c550b8def26092e76eada77cee601c51c99395c8d42d01c3a96ece7ae12
+  data.tar.gz: 260d8b199275cd94c664867ae7571d5837f22d6813059d5f7f12d31a0ad2e254f2913198ea001680716a4022d8d7c587a3b7a3a1327bca8369754ed1b3a70819

data/VERSION

@@ -1 +1 @@
-0.6.5
+0.6.6

data/gaptool-client.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'clamp', "~> 0.6"
   s.add_runtime_dependency 'net-ssh', "~> 2.9"
   s.add_runtime_dependency 'net-scp', "~> 1.2"
-  s.add_runtime_dependency 'gaptool-api', "~> 0.6.0"
+  s.add_runtime_dependency 'gaptool-api', "~> 0.6"
   s.add_runtime_dependency 'builder', "~> 3"
 
   s.add_development_dependency 'shoulda', "~> 3"

data/lib/gaptool-client.rb

@@ -99,13 +99,12 @@ module Gaptool
     option ["-e", "--environment"], "ENVIRONMENT", "Which environment, e.g. production", :required => true
     option ["-z", "--zone"], "ZONE", "AWS availability zone to put node in", :default => 'us-west-2c'
     option ["-t", "--type"], "TYPE", "Type of instance, e.g. m1.large", :required => true
-    option ["-m", "--mirror"], "GIGABYTES", "Gigs for raid mirror, must be set up on each node", :required => false
     option ["-s", "--security-group"], "SECURITY_GROUP", "Security group name. Defaults to $role-$environment", required: false
     option ['-a', '--ami'], "AMI_ID", "Use a specific AMI for the instance (i.e. ami-xxxxxxx)", :required => false
     option ["-C", "--chef-repo"], "GITURL", "git url for the chef repository", :requireds => false
     option ["-b", "--chef-branch"], "BRANCH", "branch of the chef repository to use", :required => false
     def execute
-      $api.addnode(zone, type, role, environment, mirror, security_group, ami, chef_repo, chef_branch)
+      $api.addnode(zone, type, role, environment, nil, security_group, ami, chef_repo, chef_branch)
     end
   end
 
@@ -210,7 +209,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'
+    option ["-b", "--chef-branch"], "BRANCH", "branch of the chef repository to use (defaults to last branch used during init/chefrun)", :default => nil
 
     def execute
       attrs = split_attrs(attribute_list)
@@ -231,11 +230,16 @@ module Gaptool
           'zone' => node['zone'],
           'itype' => node['itype'],
           'apps' => eval(node['apps']),
-          'chefbranch' => chef_branch
-        }.merge(attrs).to_json
+        }.merge(attrs)
+        git="git fetch --all; git reset --hard origin/`git rev-parse --abbrev-ref HEAD`"
+
+        unless chef_branch.nil?
+          json['chefbranch'] = chef_branch
+          git = "git checkout -f #{chef_branch}; git fetch --all; git reset --hard origin/#{chef_branch}"
+        end
         commands = [
-          "cd ~admin/ops; git checkout -f #{chef_branch}; git fetch --all; git reset --hard origin/#{chef_branch}",
-          "echo '#{json}' > ~admin/solo.json",
+          "cd ~admin/ops; #{git} ",
+          "echo '#{json.to_json}' > ~admin/solo.json",
           "sudo chef-solo -c ~admin/ops/cookbooks/solo.rb -j ~admin/solo.json"
         ]
         sshcmd(node, commands)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gaptool-client
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors:
 - Francesco Laurita
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-11 00:00:00.000000000 Z
+date: 2014-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -102,14 +102,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement