decking 0.0.2 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc3e349f7fa27cafe70b4a5e2fb901715bb52159
-  data.tar.gz: b01316554056df885d230d9c3632fec9e012469a
+  metadata.gz: 137023f8b0cee236fbc5612645883599181aa57c
+  data.tar.gz: 6113261cd16e5f695baf937476c02fa0cae5c6a2
 SHA512:
-  metadata.gz: a3ab5bf1ff01a0e210174b3cc574c8b28f45fc3e723e50ff9964815dd91dccccf4d534101d8677a05b1b74372304469214bf62c22cebafc160cdb7a7e57da8ec
-  data.tar.gz: ab3d2c5a3d2c0fea722f8481476e43a5e5a50201b15e6ca54fe0cc44dba991c7912afb25fa8a12a48f2211e6983a23f33070983798c550ffcc9545aa4749ff03
+  metadata.gz: 9cde73896e63d00db56db0e273f84beb560d418c4e4ad03fc68c83ce66c1b26c175eeadb298ea12adbd812c0a9fe4d61348a40ea3393a9eca52ea775d69f1ba2
+  data.tar.gz: bcd1ef4c2e421304b8005a85cc0c95e96b0ebaa6c69f10f40d03ee84b33f6f21bfbd9a3694a30a17e6924d4b70fd833dc961adfd35791f082f058b4c32c25b78

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    decking (0.0.2)
+    decking (0.0.4)
       docker-api (~> 1.22.2)
       gli
       hashie

data/bin/decking

@@ -6,6 +6,16 @@ require 'decking'
 module Decking::CLI
   @@logger = Log4r::Logger.new('decking::cli')
   extend GLI::App
+
+  accept(Hash) do |value|
+    result = {}
+    value.split(/,/).each do |pair|
+      k,v = pair.split(/=/)
+      result[k] = v
+    end
+    result
+  end
+
   sort_help :manually
   subcommand_option_handling :normal
   config_file '.deckingrc'
@@ -18,11 +28,18 @@ module Decking::CLI
   desc 'The name of the cluster to use for all commands'
   flag [:cluster], :default_value => "unknown"
 
+  desc 'Add or override environment variables on all containers in cluster'
+  flag   [:e, :env], :type => Hash, :default_value => {}
 
   pre do |global_options,options,args|
     @@logger.debug "Using #{global_options[:config]} for decking config"
     Decking::Parser.config_file global_options[:config]
     Decking::Parser.parse global_options[:cluster]
+    if !global_options[:env].nil?
+      Decking::Parser.config.containers.each_key do |container|
+        global_options[:env].each{|k, v| Decking::Parser.config.containers[container].env[k] = v}
+      end
+    end
     Decking::Parser.config.containers.map { |name, config| Decking::Container.add config }
   end
 

data/lib/decking/container/start.rb

@@ -15,7 +15,7 @@ module Decking
               port_bindings[vars[0]]  = [ { 'HostPort' => vars[0] } ]
             end
           end
-          Docker::Container.get(name).start! 'Links' => links,
+          Docker::Container.get(name).start! 'Links'        => links,
                                              'Binds'        => binds,
                                              'LxcConf'      => lxc_conf,
                                              'PortBindings' => port_bindings

data/lib/decking/parser.rb

@@ -97,7 +97,6 @@ module Decking
         if (!config.clusters[key].key? 'group') && (config.groups.key? key)
           config.clusters[key].group = key
         end
-      
         raise "Cluster '" + key + "' is empty" unless config.clusters[key].key? "containers"
         raise "Cluster '" + key + "' containers should be an Array" unless config.clusters[key].containers.instance_of? Array
       end
@@ -105,7 +104,6 @@ module Decking
 
     def parse_groups
       config.groups.each do |key, val|
-        config.groups[key]            = Hashie::Mash.new if config.groups[key].nil?
         config.groups[key].options    = Hashie::Mash.new unless config.groups[key].key? 'options'
         config.groups[key].containers = Hashie::Mash.new unless config.groups[key].key? 'containers'
         config.groups[key].containers.each do |c_key, c_val|
@@ -132,10 +130,12 @@ module Decking
         # Merge Global Overrides
         c.containers[k] = c.containers[k].deep_merge(config.global) if config.key? 'global'
         # Merge Group Overrides
-        c.containers[k] = c.containers[k].deep_merge(config.groups[config.clusters[cluster].group].options)
-        # Merge Group Container Overrides
-        if config.groups[config.clusters[cluster].group].containers.key? k
-          c.containers[k] = c.containers[k].deep_merge(config.groups[config.clusters[cluster].group].containers[k])
+        unless config.clusters[cluster].group.nil?
+          c.containers[k] = c.containers[k].deep_merge(config.groups[config.clusters[cluster].group].options)
+          # Merge Group Container Overrides
+          if config.groups[config.clusters[cluster].group].containers.key? k
+            c.containers[k] = c.containers[k].deep_merge(config.groups[config.clusters[cluster].group].containers[k])
+          end
         end
         c.containers[k].name = k + '.' + cluster
         c.containers[k].env.CONTAINER_NAME = k + '.' + cluster

data/lib/decking/version.rb

@@ -1,3 +1,3 @@
 module Decking
-  VERSION = "0.0.2"
+  VERSION = "0.0.4"
 end

data/spec/resources/decking-container-tests.yaml

@@ -29,6 +29,8 @@ containers:
     command: /bin/sh -c "while true; do echo 'Hello Brandon!!'; sleep 0.5; done"
 
 clusters:
+  test-no-group:
+    - hello-chris
   container-tests:
     - hello-chris
     - hello-brandon

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decking
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors:
 - Randy D. Wallace Jr.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-05 00:00:00.000000000 Z
+date: 2015-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie