producer-core 0.2.9 → 0.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0288c1cd99933e1e53201413bc0d8c90a6229204
-  data.tar.gz: 5d7aaef70745ce1b3396d775adfa94328a092151
+  metadata.gz: 746db32442ceec92cc0067f515e69d43c052afee
+  data.tar.gz: 8c3b7aaf1f0e4b6722609243204b635f1d5db6af
 SHA512:
-  metadata.gz: 2ca8cfca02bec39f6732bf697a2d9111119864c4e7a96176fb87669f0fc5215bb8ffd319cf5e39b90fdf984fb7edb3cfe22f75200f9e464ea89a73585cb60dac
-  data.tar.gz: 4786539f7a836eee916c4e278ba8b4206d32b5a6349c5c98e85609c638ce86b99300aa3295fab4d80e5c77cd8f8926a2fa32618beaa638b2fde8bed8c4a5011d
+  metadata.gz: ddfa5f0ffa6e5bd5b67f93d2c89b580ded6edc99876dad0e38daf5f2a3c0b36eb87b73cf0bb7ad97a257efaebe53a454263a81a838accf980dc87ee8bb531290
+  data.tar.gz: ffe69bcb350968fa1e3e97cc5ea5668efa4ac191d1e21731c7cedf797e0f9609b3a356d0441e0ec4b1bd4b3e72f910f2ba037a070edff111a4d922947a599e12

data/lib/producer/core/cli.rb

@@ -54,6 +54,7 @@ module Producer
 
       def run
         worker.process load_recipe.tasks
+        env.cleanup
       end
 
       def load_recipe

data/lib/producer/core/env.rb

@@ -44,6 +44,10 @@ module Producer
       def dry_run?
         @dry_run
       end
+
+      def cleanup
+        remote.cleanup
+      end
     end
   end
 end

data/lib/producer/core/remote/environment.rb

@@ -6,19 +6,6 @@ module Producer
           def string_to_hash(str)
             Hash[str.each_line.map { |l| l.chomp.split '=', 2 }]
           end
-
-          def new_from_string(str)
-            new string_to_hash str
-          end
-        end
-
-        extend Forwardable
-        def_delegators :@variables, :[], :key?
-
-        attr_reader :variables
-
-        def initialize(variables)
-          @variables = variables
         end
       end
     end

data/lib/producer/core/remote.rb

@@ -2,6 +2,7 @@ module Producer
   module Core
     class Remote
       attr_reader :hostname
+      attr_writer :session
 
       def initialize(hostname)
         @hostname = hostname
@@ -41,7 +42,11 @@ module Producer
       end
 
       def environment
-        Environment.new_from_string(execute 'env')
+        Environment.string_to_hash(execute 'env')
+      end
+
+      def cleanup
+        session.close if @session
       end
     end
   end

data/lib/producer/core/version.rb

@@ -1,5 +1,5 @@
 module Producer
   module Core
-    VERSION = '0.2.9'.freeze
+    VERSION = '0.2.10'.freeze
   end
 end

data/spec/producer/core/cli_spec.rb

@@ -172,6 +172,11 @@ module Producer::Core
           .with([an_instance_of(Task), an_instance_of(Task)])
         cli.run
       end
+
+      it 'cleans up the env' do
+        expect(cli.env).to receive :cleanup
+        cli.run
+      end
     end
 
     describe '#load_recipe' do

data/spec/producer/core/env_spec.rb

@@ -157,5 +157,12 @@ module Producer::Core
         expect(env).to be_dry_run
       end
     end
+
+    describe '#cleanup' do
+      it 'cleans up the remote' do
+        expect(env.remote).to receive :cleanup
+        env.cleanup
+      end
+    end
   end
 end

data/spec/producer/core/remote/environment_spec.rb

@@ -3,47 +3,15 @@ require 'spec_helper'
 module Producer::Core
   class Remote
     describe Environment do
-      let(:variables)       { { 'FOO' => 'bar', 'BAZ' => 'qux' } }
       let(:string)          { "FOO=bar\nBAZ=qux" }
       let(:argument)        { variables }
-      subject(:environment) { Environment.new(argument) }
 
       describe '.string_to_hash' do
         it 'converts key=value pairs separated by new lines to a hash' do
-          expect(described_class.string_to_hash(string)).to eq variables
-        end
-      end
-
-      describe '.new_from_string' do
-        it 'returns a new instance with converted keys and values' do
-          environment = described_class.new_from_string string
-          expect(environment.variables).to eq variables
-        end
-      end
-
-      describe '#initialize' do
-        it 'assigns the key/value pairs' do
-          expect(environment.variables).to eq variables
-        end
-      end
-
-      describe '#key?' do
-        context 'when key is defined' do
-          it 'returns true' do
-            expect(environment.key? 'FOO').to be true
-          end
-        end
-
-        context 'when key is not defined' do
-          it 'returns false' do
-            expect(environment.key? 'INEXISTENT_KEY').to be false
-          end
-        end
-      end
-
-      describe '#[]' do
-        it 'returns the value indexed by given key' do
-          expect(environment['FOO']).to eq 'bar'
+          expect(described_class.string_to_hash(string)).to eq ({
+            'FOO' => 'bar',
+            'BAZ' => 'qux'
+          })
         end
       end
     end

data/spec/producer/core/remote_spec.rb

@@ -136,5 +136,14 @@ module Producer::Core
         expect(remote.environment['FOO']).to eq 'bar'
       end
     end
+
+    describe '#cleanup' do
+      before { remote.session = double 'session' }
+
+      it 'closes the session' do
+        expect(remote.session).to receive :close
+        remote.cleanup
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: producer-core
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.10
 platform: ruby
 authors:
 - Thibault Jouan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-03 00:00:00.000000000 Z
+date: 2014-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -251,7 +251,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Provisioning tool