gaptool-client 0.5.6 → 0.5.7

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 89195581829ed0086d7056f395ce27bce1b57de9
-  data.tar.gz: 77eb3a65ebdaf3ed3161130ab4d94d794e37827f
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MmVmMjliZGEyNmIxYmE0NmIyYmNmMWMyMDQ3YTU3ZmQ4NDhiNWI1ZQ==
+  data.tar.gz: !binary |-
+    ZmUyZDQ5NGYwYWFmMjI0YjQ5YmMyYWE4OWIxZWVhZGU5NGMwMDYyNg==
 SHA512:
-  metadata.gz: d74a99fe6ce683b17b90beb9389dc2ac74faff3465158d91676f47a875d1ca789015140ac1aef4ebc7d9b98c58da0e7af295d9bdb849388662f13793fdad9b67
-  data.tar.gz: 1daf6c0f8ee2a9f695d196f4f1a9e5ac4cc45742a2690dfc9e4e4e94694a0ead03a0adc93f408fed63a14c3e6710701274f37300f96575514d2814c4aefcaaaf
+  metadata.gz: !binary |-
+    ZmU4OGQ3NzQwNmVkOGY2M2ZiZGIzODNkMTdlMmIyZjkxYWYxYjY3ZjlkMjQ0
+    NWZjYTM2OGVkOWE0Y2JhOGRhOGYyNzg5YjkwMDNmNzIzN2MzY2ViZmVjZGFm
+    ODQyYmEzMDQ1MzI2OGEwNGU2OWIyMzI4MDY0YzNlMTkyNzdjZDY=
+  data.tar.gz: !binary |-
+    MGM1OTk5MDExZWU3OTJlZmZjNzQyZmQ2YzlmZDgzYWYwMjI5YTRiMTU4ZThi
+    OTNkZDAyYmFlNzAzMzhjYTYxNDE0OWZhYWNhYjRhMzFlMDM5MmE3MzFhZDZk
+    MzUzNTk5ZGRjODM3MDc2YWE2MWEzZjI4MWExZjVjMDI4YzI0YTk=

data/VERSION

@@ -1 +1 @@
-0.5.6
+0.5.7

data/gaptool-client.gemspec

@@ -8,7 +8,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "gaptool-client"
-  s.version     = "0.5.6"
+  s.version     = `awk '{printf "%s",$0}' VERSION`
   s.authors     = ["Francesco Laurita", "Matt Bailey"]
   s.email       = ["francesco@gild.com"]
   s.homepage    = "http://www.gild.com"

data/lib/gaptool-client.rb

@@ -74,6 +74,25 @@ def sshcmd(node, commands)
   end
 end
 
+def split_attrs(attribute_list)
+  opts = {}
+  attribute_list.each do |attr_|
+    key, value = attr_.split('=', 2)
+    split = key.split('.')
+    cur = opts
+    split.each_with_index do |part, idx|
+      if idx == split.size - 1
+        # leaf, add the value
+        cur[part] = value
+      else
+        cur[part] ||= {}
+      end
+      cur = cur[part]
+    end
+  end
+  opts
+end
+
 module Gaptool
   class InitCommand < Clamp::Command
     option ["-r", "--role"], "ROLE", "Resource name to initilize", :required => true
@@ -187,8 +206,10 @@ module Gaptool
     option ["-r", "--role"], "ROLE", "Role name to ssh to", :required => true
     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
 
     def execute
+      attrs = split_attrs(attribute_list)
       if !instance.nil?
         nodes = [$api.getonenode(instance)]
       else
@@ -206,7 +227,7 @@ module Gaptool
           'zone' => node['zone'],
           'itype' => node['itype'],
           'apps' => eval(node['apps'])
-        }.to_json
+        }.merge(attrs).to_json
         commands = [
           "cd ~admin/ops; git pull",
           "echo '#{json}' > ~admin/solo.json",
@@ -224,8 +245,10 @@ module Gaptool
     option ["-b", "--branch"], "BRANCH", "Git branch to deploy, default is master", :required => false
     option ["-r", "--rollback"], :flag, "Toggle this to rollback last deploy"
     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
 
     def execute
+      attrs = split_attrs(attribute_list)
       if instance
         nodes = [$api.getonenode(instance)]
       else
@@ -248,7 +271,7 @@ module Gaptool
           'rollback' => rollback?,
           'branch' => branch || 'master',
           'migrate' => migrate?
-        }.to_json
+        }.merge(attrs).to_json
         commands = [
           "cd ~admin/ops; git pull",
           "echo '#{json}' > ~admin/solo.json",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gaptool-client
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.5.7
 platform: ruby
 authors:
 - Francesco Laurita
@@ -15,84 +15,84 @@ dependencies:
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.8'
 - !ruby/object:Gem::Dependency
   name: peach
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.5'
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: clamp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.6'
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.9'
 - !ruby/object:Gem::Dependency
   name: net-scp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
@@ -113,73 +113,73 @@ dependencies:
   name: builder
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
-description: "\n    gaptool client\n  "
+description: ! "\n    gaptool client\n  "
 email:
 - francesco@gild.com
 executables:
@@ -187,8 +187,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".document"
-- ".gitignore"
+- .document
+- .gitignore
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -209,12 +209,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []