script_executor 1.7.5 → 1.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14d76bcbd7dec002c5f8a212e401e85fc179d48d
-  data.tar.gz: fdd367cd483f92c06fca53ceed9071971ade9eb6
+  metadata.gz: 145e0125d8e949943a1bf237c1ad46f7606a427d
+  data.tar.gz: 8f43a9cfed71aa16cfe46a5bb3d7cc1ff69126f2
 SHA512:
-  metadata.gz: 7cd378c64712dcfda80578495da636439cf31845c98350f0c574daa9ffb15ce4d772875996634c7cf284fd60a1eea1259f34973ddfda1de2adbe6023f5ad4f67
-  data.tar.gz: 15301ca977bf1cc446da11ebc71caa22ae5eb7ca1b601add1f28459e2366a18af72cd149b614f6d539b15193b02e716d8e5148167ca453f5a40d64707f4e2fdd
+  metadata.gz: abe1d415c3e7d0f5f4ee6b6944194dee479d9549ff8c0c74f4d343eba05751731175e90faede22d5b4034e6f4e49dd9784c8162a92a0e79f50e05b26f0467cf5
+  data.tar.gz: 7b532fbc46970cba8763a740aacfc4ced2a0d56c970157be0b71412e11b84218061479da9f634fd4c9a0105e02b4a707428b3e8bbcc8061f9b644d248f4973b6

data/CHANGES

@@ -113,3 +113,7 @@
 == Version 1.7.5
 
 * Add one more format for name section.
+
+== Version 1.7.6
+
+* Bug fixes.

data/Gemfile.lock

@@ -4,13 +4,13 @@ GEM
     awesome_print (1.6.1)
     blankslate (3.1.3)
     diff-lcs (1.2.5)
-    file_utils (1.0.7)
+    file_utils (1.1.2)
     gemcutter (0.7.1)
     gemspec_deps_gen (1.1.2)
       bundler
       file_utils
-    highline (1.6.15)
-    json_pure (1.8.1)
+    highline (1.7.8)
+    json_pure (1.8.3)
     net-ssh (2.9.2)
     parslet (1.7.1)
       blankslate (>= 2.0, <= 4.0)
@@ -27,7 +27,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.3.0)
     rspec-support (3.3.0)
-    text-interpolator (1.1.6)
+    text-interpolator (1.1.7)
     thor (0.19.1)
 
 PLATFORMS

data/lib/script_executor/base_provision.rb

@@ -27,9 +27,9 @@ class BaseProvision
     create_script_methods
   end
 
-  def run script_name, params={}, type=:string
+  def run script_name, type=:string, env={}
     execute(server_info) do
-      evaluate_script_body(script_list[script_name.to_sym][:code], params, type)
+      evaluate_script_body(script_list[script_name.to_sym][:code], env, type)
     end
   end
 
@@ -49,13 +49,13 @@ class BaseProvision
 
   def create_script_methods
     script_list.keys.each do |name|
-      singleton_class.send(:define_method, name.to_sym) do
-        self.run name.to_s, env
+      singleton_class.send(:define_method, name.to_sym) do |type, params|
+        self.run name.to_s, type, params.empty? ? env : env.merge(params: params.join(' '))
       end
     end
   end
 
-  def create_thor_methods parent_class
+  def create_thor_methods parent_class, type=:string
     if parent_class.ancestors.collect(&:to_s).include?('Thor')
       provision = self
 
@@ -66,8 +66,8 @@ class BaseProvision
 
         parent_class.send(:desc, name, title) if parent_class.respond_to?(:desc)
 
-        parent_class.send(:define_method, name.to_sym) do
-          provision.send "#{name}".to_sym
+        parent_class.send(:define_method, name.to_sym) do |*params|
+          provision.send "#{name}".to_sym, type, params
         end
       end
     end

data/lib/script_executor/version.rb

@@ -1,3 +1,3 @@
 class ScriptExecutor
-  VERSION = "1.7.5"
+  VERSION = "1.7.6"
 end

data/spec/base_provision_spec.rb

@@ -1,23 +1,31 @@
 require 'spec_helper'
 
-require 'thor'
 require 'script_executor/base_provision'
 
-class ThorClass < Thor; end
-
 describe BaseProvision do
-  subject { BaseProvision.new 'spec/support/base.conf.json', ['spec/support/script1.sh'] }
+  subject { BaseProvision.new 'spec/support/base.conf.json', ['spec/support/script0.sh'] }
 
   describe "#initialize" do
     it "parses content from file" do
-      expect(subject.script_list.size).to equal(9)
+      expect(subject.script_list.size).to equal(3)
     end
   end
 
   describe "#run" do
-    it "parses content from file" do
-      name = 'name'
-      result = subject.run 'test1', binding, :erb
+    it "executes command with :erb type" do
+      params = OpenStruct.new({name: 'some name', "project": {"home": 'root'}})
+
+      b = params.instance_eval { binding }
+
+      result = subject.run 'test1', :erb, b
+
+      ap result
+    end
+
+    it "executes command with :string type" do
+      params = {name: 'other name'}
+
+      result = subject.run 'test2', :string, subject.env.merge(params)
 
       ap result
     end

data/spec/support/script0.sh

@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+
+
+# [test1]
+# Some description
+
+echo "<%= name %>"
+
+
+#######################################
+# [test2]
+
+echo "#{ name }"
+
+
+#######################################
+# [test3]
+
+echo "#{ name }"
+
+echo "#{params}"

data/spec/thor_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+require 'thor'
+require 'script_executor/base_provision'
+
+class ThorSpec < Thor
+  class << self
+    attr_reader :provision
+  end
+
+  @provision = BaseProvision.new 'spec/support/base.conf.json', ['spec/support/script0.sh']
+
+  @provision.create_thor_methods(self)
+end
+
+describe ThorSpec do
+  describe "#invoke" do
+    it "executes thor without parameters" do
+      ThorSpec.provision.env[:name] = 'name'
+
+      subject.invoke :test2
+    end
+
+    it "executes thor with parameters" do
+      ThorSpec.provision.env[:name] = 'name'
+
+      subject.invoke :test3, ['a', 'b','c']
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: script_executor
 version: !ruby/object:Gem::Version
-  version: 1.7.5
+  version: 1.7.6
 platform: ruby
 authors:
 - Alexander Shvets
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-31 00:00:00.000000000 Z
+date: 2015-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -172,11 +172,13 @@ files:
 - spec/scripts_parser_spec.rb
 - spec/spec_helper.rb
 - spec/support/base.conf.json
+- spec/support/script0.sh
 - spec/support/script1.sh
 - spec/support/script2.sh
 - spec/support/script3.sh
 - spec/support/script4.sh
 - spec/support/script5.sh
+- spec/thor_spec.rb
 homepage: http://github.com/shvets/script_executor
 licenses:
 - MIT
@@ -208,8 +210,10 @@ test_files:
 - spec/scripts_parser_spec.rb
 - spec/spec_helper.rb
 - spec/support/base.conf.json
+- spec/support/script0.sh
 - spec/support/script1.sh
 - spec/support/script2.sh
 - spec/support/script3.sh
 - spec/support/script4.sh
 - spec/support/script5.sh
+- spec/thor_spec.rb