kumo_dockercloud 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2582ba0407f7bdd51b0a313b93e9508719ce48c0
-  data.tar.gz: 9d1e586ca6c319a3b9db096d571b772d8c026d48
+  metadata.gz: a9506aa4ff5a6e5dc9775ba9cf36dc4ad5959bc4
+  data.tar.gz: 8848e236285eb1043ec39d20930b6f807573e369
 SHA512:
-  metadata.gz: c67e36f20cd1691b05d0fad87f9133a38f33d3a4a9efda200a213e318b8fe2b13a4474c54df70b5cbdcbaa4e59a103ec19f8103e8d7082dd0bf6ea8efb669e48
-  data.tar.gz: 5109665c78f88ff6af562c82d0030d37696068737474e531f2848a970b0d5f62ba59397e00dc2ac21dd81c231b6f8865067f96e00998e1eba04b36a9b616ca12
+  metadata.gz: 46f6600d38e3a32f976664d4ddd52e1d494e4b3c2323830f4c689f7c399dbdfa7b1bb16109f62823d106cf864d3c91d4d64b534b23ee8971e82112bd494a302c
+  data.tar.gz: 02b6be74db826142d5018825b7cacb97529d940ffe026bf1e4f002aef8083f9d24c619bda9e1ab10eeb529693183cf2f9d545543bf21321725c6554edd47ed1b

data/lib/kumo_dockercloud/stack_file.rb

@@ -11,6 +11,7 @@ module KumoDockerCloud
         key_string = key.to_s
         parsed[key_string]['environment'] ||= {}
         parsed[key_string]['environment'].merge!(converted_env_vars.fetch(key_string))
+        parsed[key_string]['environment'] = escape_characters_that_need_special_handling(parsed[key_string]['environment'])
       end
 
       parsed
@@ -20,6 +21,10 @@ module KumoDockerCloud
       env_vars.keys.reduce({}) { |acc, key| acc[key.to_s] = env_vars[key]; acc }
     end
 
+    def self.escape_characters_that_need_special_handling(env_hash)
+      env_hash.keys.reduce({}) { |acc, key| acc[key] = env_hash[key].gsub(/[$]{1}/, "$$"); acc }
+    end
+
     private_class_method :make_all_root_level_keys_strings
   end
 end

data/lib/kumo_dockercloud/version.rb

@@ -1,3 +1,3 @@
 module KumoDockerCloud
-  VERSION = '2.1.0'
+  VERSION = '2.2.0'
 end

data/spec/kumo_dockercloud/stack_file_spec.rb

@@ -43,6 +43,7 @@ describe KumoDockerCloud::StackFile do
               TEST: thing
         eos
       end
+
       it 'should add new secrets to the environment' do
         expect(subject).to eq(app_name => {
           'image' => 'a-thing',
@@ -52,6 +53,29 @@ describe KumoDockerCloud::StackFile do
           }
         })
       end
+
+      context 'and environment variables that contain symbols that need special escaping' do
+        let(:stack_template) do
+          <<-eos
+            application-stack-name:
+              image: a-thing
+              environment:
+                TEST: 123$abc
+          eos
+        end
+
+        # to work around https://github.com/docker/dockercloud-cli/issues/17
+        it 'escapes environment variables that contain $ with an extra $' do
+
+          expect(subject).to eq(app_name => {
+            'image' => 'a-thing',
+            'environment' => {
+              'TEST' => '123$$abc',
+              'KEY' => 'VALUE'
+            }
+          })
+        end
+      end
     end
 
     context 'without any existing environment' do
@@ -61,6 +85,7 @@ describe KumoDockerCloud::StackFile do
             image: a-thing
         eos
       end
+
       it 'should create the environment with secrets in it' do
         expect(subject).to eq(app_name => {
           'image' => 'a-thing',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kumo_dockercloud
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Redbubble
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-03 00:00:00.000000000 Z
+date: 2016-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpi