producer-core 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 515591ca8ef96ecfcc27483fd7747f2ec8a1f4cb
-  data.tar.gz: f210d937db08c53613eac2dccdeccac336238791
+  metadata.gz: 4895dde05c3db8c7fddcaece8d7f94aa525ff45d
+  data.tar.gz: 919123f791a2de0b2364e192c42662de44ec922d
 SHA512:
-  metadata.gz: 9b33e1e5cf7c6c2c1f66460b3c10181eb1c8369ef530ca05cb20851ad348ff5b8c297f320190c0db0ffff5257e0c27752593b16f426b4f0a6ad28a43ff9d8c17
-  data.tar.gz: bf84a175211505298d77f92796952996618721c1c92d15e2168cbcf6842d2b35491d614d5d2500091c9fb3a99a9a341e135085be9beb7b3a753cc1c062ffa304
+  metadata.gz: c073aa03b75b67b5b3a0d300820fce5d009c9a245e8c8d7abecc167e02a2f2842628b42d8d40b213e481b4d1824759fc972f139e7fbe7fcbf1d4ab5660418483
+  data.tar.gz: 7c5f80f18a7d7b694eb2b3027d678cf79e6b13e015c4f6722ad2a060e5b02c3dbecca418d005f3972b0cfef9eadfce8d6cc79568260d0c26b76ea4e33186106f

data/features/{actions/echo.feature → action_echo.feature}

@@ -3,7 +3,7 @@ Feature: `echo' task action
   Scenario: prints text on standard output
     Given a recipe with:
       """
-      task :say_hello do
+      task :echo_action do
         echo 'hello'
       end
       """

data/features/{actions/file_append.feature → action_file_append.feature}

@@ -9,7 +9,7 @@ Feature: `file_append' task action
       """
       target 'some_host.test'
 
-      task :append_content_to_file do
+      task :file_append_action do
         file_append 'some_file', ' added'
       end
       """

data/features/{actions/file_replace_content.feature → action_file_replace_content.feature}

@@ -3,27 +3,24 @@ Feature: `file_replace_content' task action
 
   Background:
     Given a remote file named "some_file" with "some content"
-
-  Scenario: replaces a string by another in the requested file
-    Given a recipe with:
+    And a remote file named "other_file" with "some content"
+    And a recipe with:
       """
       target 'some_host.test'
 
-      task :replace_string_in_file do
+      task :file_replace_content_action_string do
         file_replace_content 'some_file', 'content', 'other content'
       end
+
+      task :file_replace_content_action_regexp do
+        file_replace_content 'other_file', /\w+\z/, 'other content'
+      end
       """
+
+  Scenario: replaces a string by another in the requested file
     When I successfully execute the recipe
-    And the remote file "some_file" must contain exactly "some other content"
+    Then the remote file "some_file" must contain exactly "some other content"
 
   Scenario: replaces a regular expression by a string in the requested file
-    Given a recipe with:
-      """
-      target 'some_host.test'
-
-      task :replace_regexp_in_file do
-        file_replace_content 'some_file', /\w+\z/, 'other content'
-      end
-      """
     When I successfully execute the recipe
-    And the remote file "some_file" must contain exactly "some other content"
+    Then the remote file "other_file" must contain exactly "some other content"

data/features/{actions/file_write.feature → action_file_write.feature}

@@ -1,28 +1,23 @@
 @sshd
 Feature: `file_write' task action
 
-  Scenario: writes given data to given file path
+  Background:
     Given a recipe with:
       """
       target 'some_host.test'
 
-      task :write_some_data do
-        file_write 'some_file', 'some_content'
+      task :file_write_action do
+        file_write 'some_file',       'some_content'
+        file_write 'some_file_0600',  'some_content', 0600
+        file_write 'some_file_0700',  'some_content', 0700
       end
       """
+
+  Scenario: writes given data to given file path
     When I successfully execute the recipe
     Then the remote file "some_file" must contain "some_content"
 
   Scenario: creates file with given permissions
-    Given a recipe with:
-      """
-      target 'some_host.test'
-
-      task :write_some_data do
-        file_write 'some_file_0600', 'some_content', 0600
-        file_write 'some_file_0700', 'some_content', 0700
-      end
-      """
     When I successfully execute the recipe
     Then the remote file "some_file_0600" must have 0600 mode
     And  the remote file "some_file_0700" must have 0700 mode

data/features/{actions/mkdir.feature → action_mkdir.feature}

@@ -1,28 +1,23 @@
 @sshd
 Feature: `mkdir' task action
 
-  Scenario: creates directory given as argument
+  Background:
     Given a recipe with:
       """
       target 'some_host.test'
 
-      task :create_some_dir do
+      task :mkdir_action do
         mkdir 'some_directory'
+        mkdir 'some_directory_0700', 0700
+        mkdir 'some_directory_0500', 0500
       end
       """
+
+  Scenario: creates directory given as argument
     When I successfully execute the recipe
     Then the remote directory "some_directory" must exists
 
   Scenario: creates directory with given permissions
-    Given a recipe with:
-      """
-      target 'some_host.test'
-
-      task :create_some_dir do
-        mkdir '0700_directory', 0700
-        mkdir '0500_directory', 0500
-      end
-      """
     When I successfully execute the recipe
-    Then the remote directory "0700_directory" must have 0700 mode
-    And  the remote directory "0500_directory" must have 0500 mode
+    Then the remote directory "some_directory_0700" must have 0700 mode
+    And  the remote directory "some_directory_0500" must have 0500 mode

data/features/{actions/sh.feature → action_sh.feature}

@@ -1,24 +1,12 @@
 @sshd
 Feature: `sh' task action
 
-  Scenario: executes command
-    Given a recipe with:
-      """
-      target 'some_host.test'
-
-      task :some_task do
-        sh '\true'
-      end
-      """
-    When I execute the recipe
-    Then the exit status must be 0
-
   Scenario: forwards standard ouput
     Given a recipe with:
       """
       target 'some_host.test'
 
-      task :some_task do
+      task :sh_action do
         sh '\echo hello from remote'
       end
       """
@@ -30,10 +18,22 @@ Feature: `sh' task action
       """
       target 'some_host.test'
 
-      task :some_task do
+      task :sh_action_aborting do
         sh '\false'
         sh '\echo after_fail'
       end
       """
     When I execute the recipe
     Then the output must not contain "after_fail"
+
+  Scenario: prints command when execution fail
+    Given a recipe with:
+      """
+      target 'some_host.test'
+
+      task :sh_action_command_error do
+        sh '\false'
+      end
+      """
+    When I execute the recipe
+    Then the output must match /\A\w+Error:\s+\\false/

data/features/{cli/usage.feature → cli_usage.feature}

@@ -1,5 +1,6 @@
 Feature: CLI usage
 
+  @exec
   Scenario: prints the usage when an argument is missing
     When I run `producer`
     Then the exit status must be 64

data/features/{cli/verbose.feature → cli_verbose.feature}

@@ -1,42 +1,31 @@
 Feature: CLI verbose option
 
-  Scenario: prints tasks name
-    Given a recipe with:
-      """
-      task :say_hello do
-      end
-      """
-    When I successfully execute the recipe with option -v
-    Then the output must match /Task:.+say_hello/
-
-  Scenario: prints whether condition is met
+  Background:
     Given a recipe with:
       """
       task :task_ok do
         condition { true }
+
+        echo 'some mesasge'
       end
+
       task :task_ko do
         condition { false }
       end
       """
+
+  Scenario: prints tasks name
+    When I successfully execute the recipe with option -v
+    Then the output must match /Task:.+task_ok/
+
+  Scenario: prints whether condition is met
     When I successfully execute the recipe with option -v
     Then the output must match /task_ok.+ condition: met.*task_ko.* condition: NOT met/
 
   Scenario: prints actions info
-    Given a recipe with:
-      """
-      task :say_hello do
-        echo 'hello message'
-      end
-      """
     When I successfully execute the recipe with option -v
-    Then the output must match /say_hello.+ action: echo/
+    Then the output must match /task_ok.+ action: echo/
 
   Scenario: formats message with our simple logger
-    Given a recipe with:
-      """
-      task :say_hello do
-      end
-      """
     When I successfully execute the recipe with option -v
-    Then the output must match /\ATask:.+say_hello.*\n.*condition/
+    Then the output must match /\ATask:.+task_ok.*\n.*condition/

data/features/{recipes/ask.feature → recipe_ask.feature}

@@ -1,5 +1,6 @@
 Feature: `ask' recipe keyword
 
+  @exec
   Scenario: prompts user with a list of choices on standard output
     Given a recipe with:
       """

data/features/{recipes/macro.feature → recipe_macro.feature}

@@ -1,6 +1,6 @@
 Feature: `macro' recipe keyword
 
-  Scenario: declares new keyword accepting task code
+  Scenario: declares a new keyword accepting task code
     Given a recipe with:
       """
       macro :hello do
@@ -28,7 +28,7 @@ Feature: `macro' recipe keyword
     Given a recipe with:
       """
       macro :my_echo do |message|
-        condition { message =~ /bar/ }
+        condition { message =~ /foo/ }
 
         echo message
       end
@@ -36,5 +36,5 @@ Feature: `macro' recipe keyword
       %w[foo bar].each { |e| my_echo e }
       """
     When I successfully execute the recipe
-    Then the output must not contain "foo"
-    And the output must contain "bar"
+    Then the output must contain "foo"
+    And the output must not contain "bar"

data/features/{recipes/source.feature → recipe_source.feature}

@@ -9,7 +9,9 @@ Feature: `source' recipe keyword
   Scenario: requires a recipe file
     Given a file named "sourced_recipe.rb" with:
       """
-      puts 'sourced recipe'
+      task :some_task do
+        echo 'sourced recipe'
+      end
       """
     When I successfully execute the recipe
     Then the output must contain "sourced recipe"

data/features/{recipes/target.feature → recipe_target.feature}

@@ -5,7 +5,9 @@ Feature: `target' recipe keyword
       """
       target 'some_host.example'
 
-      puts env.target
+      task :some_task do
+        echo env.target
+      end
       """
     When I successfully execute the recipe
     Then the output must contain exactly "some_host.example\n"

data/features/recipe_test_macro.feature

@@ -0,0 +1,52 @@
+Feature: `test_macro' recipe keyword
+
+  Scenario: declares a new test keyword
+    Given a recipe with:
+      """
+      test_macro :even? do |n|
+        n % 2 == 0
+      end
+
+      [1, 2].each do |n|
+        task "test_macro-even-#{n}" do
+          condition { even? n }
+          echo n
+        end
+      end
+      """
+    When I successfully execute the recipe
+    Then the output must contain "2"
+    And the output must not contain "1"
+
+  @sshd
+  Scenario: has access to core tests
+    Given a recipe with:
+      """
+      target 'some_host.test'
+
+      test_macro(:other_env?) { |k| env? k }
+
+      [:shell, :non_existent_var].each do |k|
+        task "test_macro-condition-#{k}" do
+          condition { other_env? k }
+          echo "#{k}_ok"
+        end
+      end
+      """
+    When I successfully execute the recipe
+    Then the output must contain "shell_ok"
+    Then the output must not contain "non_existent_var_ok"
+
+  Scenario: has access to other tests declared with `test_macro'
+    Given a recipe with:
+      """
+      test_macro(:one?)       { |e| e == 1 }
+      test_macro(:one_alias?) { |e| one? e }
+
+      task :test_macro_macro do
+        condition { one_alias? 1 }
+        echo 'one_alias_ok'
+      end
+      """
+    When I successfully execute the recipe
+    Then the output must contain "one_alias_ok"

data/features/{recipes/registry.feature → registry.feature}

@@ -1,21 +1,26 @@
 Feature: key/value registry
 
-  Scenario: `set' keyword registers a value in the registry
+  Scenario: `get' keyword in a task fetches a value registered with `set'
     Given a recipe with:
       """
       set :some_key, 'some_value'
 
-      puts env.registry[:some_key]
+      task :registry_testing do
+        echo get :some_key
+      end
       """
     When I successfully execute the recipe
     Then the output must contain "some_value"
 
-  Scenario: `get' keyword fetches a value from the registry
+  Scenario: `get' keyword fetches a value from the recipe
     Given a recipe with:
       """
       set :some_key, 'some_value'
+      set :other_key, get(:some_key)
 
-      puts get :some_key
+      task :registry_testing do
+        echo get :other_key
+      end
       """
     When I successfully execute the recipe
     Then the output must contain "some_value"

data/features/{ssh/config.feature → ssh_config.feature}

@@ -5,7 +5,9 @@ Feature: SSH settings
       """
       target 'some_host.example'
 
-      puts env.remote.user_name
+      task :some_task do
+        echo env.remote.user_name
+      end
       """
 
   Scenario: uses current user login name as SSH user name by default

data/features/support/env.rb

@@ -1,2 +1,34 @@
 require 'aruba/cucumber'
+require 'aruba/in_process'
 require 'cucumber/sshd/cucumber'
+require 'producer/core'
+
+
+class ArubaProgramWrapper
+  def initialize(argv, stdin = $stdin, stdout = $stdout, stderr = $stderr,
+    kernel = Kernel)
+    @argv   = argv
+    @stdin  = stdin
+    @stdout = stdout
+    @stderr = stderr
+    @kernel = kernel
+  end
+
+  def execute!
+    Producer::Core::CLI.run!(
+      @argv.dup, stdin: @stdin, stdout: @stdout, stderr: @stderr
+    )
+  rescue SystemExit => e
+    @kernel.exit(e.status)
+  end
+end
+
+
+Before('@exec') do
+  Aruba.process = Aruba::SpawnProcess
+end
+
+Before('~@exec') do
+  Aruba::InProcess.main_class = ArubaProgramWrapper
+  Aruba.process = Aruba::InProcess
+end