producer-core 0.2.14 → 0.2.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 961e79ea57d0b4e4db3b33cc2a0665efbda76aac
-  data.tar.gz: ef532a17f25bfc0e746ee5af7d14b553beb00419
+  metadata.gz: 875191e45bda2ff4554cafda7ebce7eca67887c6
+  data.tar.gz: fc971de1aedd2cef0d0187ab41e870091b507978
 SHA512:
-  metadata.gz: b7a09c92aabde58b964fc612f1118301deb8d627c9b6b0c447255d740081765b2309b93b04ecd50db556e4e7ee2e3d9f4979b86a36717b7a9c4f0e3e25016072
-  data.tar.gz: 6d4fec1fe651713a7dcb4ecc52792bc6ca9892504e4ae786a73af6f266ec9dcdefe2bf3072c5e437d5286977432cbcb1074d0a1d52c317a56334a42542b580d2
+  metadata.gz: e0d7b779cceb0281e01ea51fdabbf7da0e1a13a1c4d1016dfd321c5aedc63031e82d3195ae546c36a540f823c08682121e9eb4a33602d1f59229b52173f4045c
+  data.tar.gz: 7cfe40e211ec6dac6c0bf0d67b8f28fab98b8b600bcad20b62b319ba054ee7a0fb688d276c09d015d22856907510e21c0660a1dc64d7616fde1dd4dcee52dc05

data/lib/producer/core/cli.rb

@@ -25,7 +25,7 @@ module Producer
         end
       end
 
-      attr_reader :arguments, :stdin, :stdout, :stderr, :env
+      attr_reader :arguments, :env
 
       def initialize(args, stdin: $stdin, stdout: $stdout, stderr: $stderr)
         @arguments  = args
@@ -49,20 +49,16 @@ module Producer
           m
         end
 
-        fail ArgumentError unless arguments.any?
+        fail ArgumentError unless @arguments.any?
       end
 
-      def run
-        worker.process load_recipe.tasks
-        env.cleanup
+      def run(worker: Worker.new(@env))
+        worker.process recipe.tasks
+        @env.cleanup
       end
 
-      def load_recipe
-        Recipe.evaluate_from_file(@arguments.first, env)
-      end
-
-      def worker
-        Worker.new(env)
+      def recipe
+        @recipe ||= Recipe.evaluate_from_file(@arguments.first, env)
       end
     end
   end

data/lib/producer/core/version.rb

@@ -1,5 +1,5 @@
 module Producer
   module Core
-    VERSION = '0.2.14'.freeze
+    VERSION = '0.2.15'.freeze
   end
 end

data/spec/fixtures/recipes/raise.rb

@@ -0,0 +1 @@
+fail Producer::Core::RemoteCommandExecutionError, 'false'

data/spec/producer/core/cli_spec.rb

@@ -8,108 +8,53 @@ module Producer::Core
     let(:recipe_file) { fixture_path_for 'recipes/some_recipe.rb' }
     let(:options)     { [] }
     let(:arguments)   { [*options, recipe_file] }
-    let(:stdin)       { StringIO.new}
-    let(:stdout)      { StringIO.new }
-    let(:stderr)      { StringIO.new }
 
-    subject(:cli)     { described_class.new(
-                          arguments,
-                          stdin: stdin, stdout: stdout, stderr: stderr) }
+    subject(:cli)     { described_class.new(arguments) }
 
     describe '.run!' do
-      let(:cli) { double('cli').as_null_object }
+      let(:stderr)    { StringIO.new }
+      subject(:run!)  { described_class.run! arguments, stderr: stderr }
 
-      subject(:run) do
-        described_class.run! arguments,
-          stdin:  stdin,
-          stdout: stdout,
-          stderr: stderr
-      end
-
-      before { allow(described_class).to receive(:new) { cli } }
-
-      it 'builds a new CLI with given arguments and streams' do
-        expect(described_class).to receive(:new).with(arguments,
-          stdin:  stdin,
-          stdout: stdout,
-          stderr: stderr
-        )
-        run
-      end
-
-      it 'runs the CLI' do
-        expect(cli).to receive :run
-        run
-      end
-
-      it 'parses CLI arguments' do
-        expect(cli).to receive :parse_arguments!
-        run
-      end
-
-      context 'when an argument error is raised' do
-        before do
-          allow(cli).to receive(:parse_arguments!)
-            .and_raise described_class::ArgumentError
-        end
+      context 'when given arguments are invalid' do
+        let(:arguments) { [] }
 
         it 'exits with a return status of 64' do
-          expect { run }.to raise_error(SystemExit) do |e|
+          expect { run! }.to raise_error(SystemExit) do |e|
             expect(e.status).to eq 64
           end
         end
 
         it 'prints the usage on the error stream' do
-          trap_exit { run }
+          trap_exit { run! }
           expect(stderr.string).to match /\AUsage: .+/
         end
       end
 
       context 'when a runtime error is raised' do
-        before do
-          allow(cli).to receive(:run)
-            .and_raise RuntimeError, 'some message'
-        end
+        let(:recipe_file) { fixture_path_for 'recipes/raise.rb' }
 
         it 'exits with a return status of 70' do
-          expect { run }.to raise_error(SystemExit) do |e|
+          expect { run! }.to raise_error(SystemExit) do |e|
             expect(e.status).to eq 70
           end
         end
 
         it 'prints exception name and message and the error stream' do
-          trap_exit { run }
-          expect(stderr.string).to match /\ARuntimeError: some message/
+          trap_exit { run! }
+          expect(stderr.string).to eq "RemoteCommandExecutionError: false\n"
         end
       end
     end
 
-    describe '#initialize' do
-      subject(:cli) { described_class.new(arguments) }
-
-      it 'assigns $stdin as the default standard input' do
-        expect(cli.stdin).to be $stdin
-      end
-
-      it 'assigns $stdout as the default standard output' do
-        expect(cli.stdout).to be $stdout
-      end
-    end
-
-    describe '#arguments' do
-      it 'returns the assigned arguments' do
-        expect(cli.arguments).to eq arguments
-      end
-    end
+    describe '#env' do
+      let(:stdin)   { StringIO.new }
+      let(:stdout)  { StringIO.new }
+      let(:stderr)  { StringIO.new }
 
-    describe '#stdout' do
-      it 'returns the assigned standard output' do
-        expect(cli.stdout).to be stdout
-      end
-    end
+      subject(:cli) { described_class.new(arguments,
+                        stdin: stdin, stdout: stdout, stderr: stderr) }
 
-    describe '#env' do
-      it 'returns the assigned env' do
+      it 'returns an env' do
         expect(cli.env).to be_an Env
       end
 
@@ -171,12 +116,10 @@ module Producer::Core
     end
 
     describe '#run' do
-      it 'process recipe tasks with given worker' do
-        worker = double 'worker'
-        allow(cli).to receive(:worker) { worker }
-        expect(worker).to receive(:process)
-          .with([an_instance_of(Task), an_instance_of(Task)])
-        cli.run
+      it 'processes recipe tasks with a worker' do
+        worker = instance_spy Worker
+        cli.run worker: worker
+        expect(worker).to have_received(:process).with cli.recipe.tasks
       end
 
       it 'cleans up the env' do
@@ -185,25 +128,12 @@ module Producer::Core
       end
     end
 
-    describe '#load_recipe' do
-      it 'evaluates the recipe file with the CLI env' do
-        expect(Recipe)
-          .to receive(:evaluate_from_file).with(recipe_file, cli.env)
-        cli.load_recipe
-      end
-
-      it 'returns the recipe' do
-        expect(cli.load_recipe).to be_a Recipe
-      end
-    end
-
-    describe '#worker' do
-      it 'returns a worker' do
-        expect(cli.worker).to be_a Worker
-      end
-
-      it 'assigns the CLI env' do
-        expect(cli.worker.env).to eq cli.env
+    describe '#recipe' do
+      it 'returns the evaluated recipe' do
+        expect(cli.recipe.tasks).to match [
+          an_object_having_attributes(name: :some_task),
+          an_object_having_attributes(name: :another_task)
+        ]
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: producer-core
 version: !ruby/object:Gem::Version
-  version: 0.2.14
+  version: 0.2.15
 platform: ruby
 authors:
 - Thibault Jouan
@@ -195,6 +195,7 @@ files:
 - lib/producer/core/worker.rb
 - producer-core.gemspec
 - spec/fixtures/recipes/empty.rb
+- spec/fixtures/recipes/raise.rb
 - spec/fixtures/recipes/some_recipe.rb
 - spec/fixtures/recipes/throw.rb
 - spec/producer/core/action_spec.rb
@@ -296,6 +297,7 @@ test_files:
 - features/test_negated_test.feature
 - features/test_shell_command_status.feature
 - spec/fixtures/recipes/empty.rb
+- spec/fixtures/recipes/raise.rb
 - spec/fixtures/recipes/some_recipe.rb
 - spec/fixtures/recipes/throw.rb
 - spec/producer/core/action_spec.rb