kumo_dockercloud 3.5.1 → 3.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba517a6429847cb8c9451cc72b4c34e6eece96f9
-  data.tar.gz: 7a6a60908dcec60b09bfb6170a1651852e32ebac
+  metadata.gz: 8bd37c3774cc85c39d59e0f257b5ca1ce8f3ed2a
+  data.tar.gz: 7e11bf779b5e49a899ea426c63a2a60bb51b558c
 SHA512:
-  metadata.gz: f2cf3ec253bc1d672a1296b4f0cf06725f142c0d0b035ef7ee5d0f1a45aff610daf8dc04e18c62b9119fdbed66beebc93d1e0e56cfbe5e0f7b2872d819f00834
-  data.tar.gz: b4bafb4f2aba62e1112bd526fd97aa35c4185295faf13294943b11f3648ef6fb36715f4b91a1b1e2f428625440e65ce4dd4bc1c230308e6394d1af473b0459a9
+  metadata.gz: a6aa4ca4c6c1ef8599b1ae471c2c9190052ef92b5eb07f15fa23b003f26f395a6f2736d6dd490d8d6ce74545ae79a115ffec4bf126b4eae714e84704e8a6316a
+  data.tar.gz: eaff3fe986ced41fb48f85bc56722029166f5a3aa0d236d202dd470b5b3ed29d2b8bd474e59c412410c4ef5e27b9b764a603c6563020af3bfaa0a199b60d31f4

data/README.md

@@ -1,4 +1,5 @@
-# KumoDockerCloud [![Build status](https://badge.buildkite.com/e9ebd06f4732bbb2a914228ac8816a2bbbeaf8bf0444ea00b4.svg)](https://buildkite.com/redbubble/kumo-docker-cloud)
+# KumoDockerCloud 
+[![Build status](https://badge.buildkite.com/d22efc59148d48d86ca78e6129340070d1a459031a019fff48.svg)](https://buildkite.com/redbubble/kumo-dockercloud-gem) [![Code Climate](https://codeclimate.com/github/redbubble/kumo_dockercloud_gem/badges/gpa.svg)](https://codeclimate.com/github/redbubble/kumo_dockercloud_gem)
 
 This is the Redbubble wrapper around creating environments in docker cloud.  It is built into our rbdevltools container and can then be used during `apply-env` and `deploy` tasks.
 

data/lib/kumo_dockercloud/environment.rb

@@ -21,9 +21,9 @@ module KumoDockerCloud
       @stack_template_path = params.fetch(:stack_template_path)
       @timeout = params.fetch(:timeout, 120)
       @confirmation_timeout = params.fetch(:confirmation_timeout, 30)
-
       @app_name = params.fetch(:app_name)
       @config = EnvironmentConfig.new(app_name: @app_name, env_name: @env_name, config_path: params.fetch(:config_path))
+      @stack = Stack.new(@app_name, @env_name)
     end
 
     def apply(stack_checker = StackChecker.new)
@@ -37,10 +37,8 @@ module KumoDockerCloud
 
       run_command("docker-cloud stack redeploy #{stack_name}")
 
-      stack = Stack.new(@app_name, @env_name)
-
       begin
-        stack_checker.verify(stack)
+        stack_checker.verify(@stack)
       rescue StackCheckError
         raise EnvironmentApplyError.new("The stack is not in the expected state.")
       end
@@ -76,8 +74,7 @@ module KumoDockerCloud
     end
 
     def exists?
-      result = evaluate_command('docker-cloud stack ls')
-      result.include?(stack_name)
+      @stack.exists?
     end
 
     def write_stack_config_file(stack_file_data)

data/lib/kumo_dockercloud/stack.rb

@@ -19,6 +19,10 @@ module KumoDockerCloud
       checker.verify(service)
     end
 
+    def exists?
+      !docker_cloud_stack.nil?
+    end
+
     def deploy_blue_green(service_names, version, checker = ServiceChecker.new)
       haproxy_service = HaproxyService.new(@stack_name, docker_cloud_api)
 
@@ -70,5 +74,9 @@ module KumoDockerCloud
 
       @docker_cloud_api ||= DockerCloudApi.new(dockercloud_api_options)
     end
+
+    def docker_cloud_stack
+      @docker_cloud_stack ||= docker_cloud_api.stack_by_name(@stack_name)
+    end
   end
 end

data/lib/kumo_dockercloud/version.rb

@@ -1,3 +1,3 @@
 module KumoDockerCloud
-  VERSION = '3.5.1'
+  VERSION = '3.5.2'
 end

data/spec/kumo_dockercloud/environment_spec.rb

@@ -19,27 +19,26 @@ describe KumoDockerCloud::Environment do
   let(:full_stack_name) { "#{app_name}-test" }
   let(:confirmation_timeout) { 0.5 }
   let(:stack_template_path) { File.join(__dir__, '../fixtures/stack.yml.erb') }
-
+  let(:exists_param) { true }
   let(:params) { {name: env_name, env_vars: env_vars, app_name: app_name, config_path: 'a path', stack_template_path: stack_template_path, confirmation_timeout: confirmation_timeout} }
+  let(:stack) { instance_double(KumoDockerCloud::Stack, :stack, exists?: exists_param, stack_name: full_stack_name) }
 
   subject(:env) { described_class.new(params) }
 
   before do
     allow(KumoDockerCloud::EnvironmentConfig).to receive(:new).and_return(config)
     allow(KumoDockerCloud::StackFile).to receive(:create_from_template).and_return(stack_file)
+    allow(KumoDockerCloud::Stack).to receive(:new).with(app_name, env_name).and_return(stack)
   end
 
   describe "#apply" do
     subject { env.apply }
-    let(:stack) { {"#{full_stack_name}" => 'stack stuff'} }
     let(:stack_checker) { instance_double(KumoDockerCloud::StackChecker, :stack_checker, verify: true) }
     before do
       allow(config).to receive(:image_tag).and_return('latest')
       allow(env).to receive(:evaluate_command).and_return app_name
       allow(env).to receive(:run_command)
       allow(KumoDockerCloud::StackChecker).to receive(:new).and_return(stack_checker)
-      allow(KumoDockerCloud::Stack).to receive(:new).with(app_name, env_name).and_return(stack)
-
     end
 
     it "writes a stack file" do
@@ -48,10 +47,13 @@ describe KumoDockerCloud::Environment do
       subject
     end
 
-    it 'runs the stack command' do
-      expect(env).to receive(:run_command).with(%r{^docker-cloud stack create -f .* -n #{full_stack_name}$})
+    context 'when the stack does not exist' do
+      let(:exists_param) { false }
+      it 'runs the stack command' do
+        expect(env).to receive(:run_command).with(%r{^docker-cloud stack create -f .* -n #{full_stack_name}$})
 
-      subject
+        subject
+      end
     end
 
     it 'runs the redeploy command' do
@@ -133,6 +135,5 @@ describe KumoDockerCloud::Environment do
       expect(KumoDockerCloud::ConsoleJockey).to receive(:get_confirmation).with(confirmation_timeout).and_return(false)
       subject
     end
-
   end
 end

data/spec/kumo_dockercloud/stack_spec.rb

@@ -200,4 +200,26 @@ describe KumoDockerCloud::Stack do
       expect(subject).to eq([redbubble_service])
     end
   end
+
+  describe '#exists' do
+    subject { stack.exists? }
+    let(:docker_cloud_api) { instance_double(KumoDockerCloud::DockerCloudApi, stack_by_name: docker_cloud_stack) }
+    before do
+      allow(KumoDockerCloud::DockerCloudApi).to receive(:new).and_return docker_cloud_api
+    end
+
+    context 'when the stack exists in docker cloud' do
+      let(:docker_cloud_stack) { double(:docker_cloud_stack) }
+      it 'is true when the stack exists in docker cloud' do
+        expect(subject).to eq(true)
+      end
+    end
+
+    context 'when the stack does not exist in docker cloud' do
+      let(:docker_cloud_stack) { nil }
+      it 'is false when the stack does not exist in docker cloud' do
+        expect(subject).to eq(false)
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kumo_dockercloud
 version: !ruby/object:Gem::Version
-  version: 3.5.1
+  version: 3.5.2
 platform: ruby
 authors:
 - Redbubble
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-08 00:00:00.000000000 Z
+date: 2016-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpi