acts_as_shellscript_executable 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b5b36e986f4ca4ff2c46a909bd2432362c377c8
-  data.tar.gz: 14abb316f1683d19d0cf4258de69e0f3024fe50b
+  metadata.gz: 0b465054cb5119511d8b8738e3d78b542f07da1e
+  data.tar.gz: 77f65e6a73801397000f4dd4521780ffeb2fa4f7
 SHA512:
-  metadata.gz: f28ccb2e65d36b4d8505e3b18d238fcb20e76848f85bb4d56392a2e686c0e0de2526472f021e97c42f2483c3c7f90873ce025561233e8a6645cfdf7b6ff93d55
-  data.tar.gz: 6d1fd98c72e34accf3c3a974473fe0c86991c65cc830cd7e6c371cdb0577ee017d1ba3ff1340ea564aa500b2239c3ed5b068c1693c6a6ad2d4c5cdd0f0defd02
+  metadata.gz: 61f07132577ee040f24022ba2f5265fda7b6bb2fe6b80d1738d203fc5c2e6ff4896ed35c4932797e86349805b1ed4d905acc712ee8ef4f315012c062135d55ee
+  data.tar.gz: d8f373854a11636078f781304aac40f7d5beb1ae5ed5c18ce3fc9de79ef892d8f55e56425f1fc0acfb21f39d5c3e8e331029298a80c64f2dea4e7760ba1fd463

data/.ruby-version

@@ -1 +1 @@
-2.1
+2.1.3

data/.travis.yml

@@ -4,7 +4,6 @@ rvm:
   - 2.1.2
   - 2.1.0
   - 2.0.0
-  - 1.9.3
   - 'ruby-head'
 matrix:
   allow_failures:

data/Gemfile

@@ -5,3 +5,4 @@ gemspec
 
 gem 'coveralls', require: false
 gem 'rubocop', require: false
+gem 'pry'

data/README.md

@@ -34,7 +34,7 @@ script.save!
 ## #execute!
 
 * `#execute!(no args)`
-    * returns scripts stdout of whole of the shellscript
+    * returns the shellscript's stdout of whole of the shellscript
 
 * `#execute!(block)`
     * returns `nil`, yields the shellscript's stdout st each line(splited by `\n`)
@@ -48,6 +48,20 @@ script.save!
 * `method:` (default: `execute!`)
     * the execute method's name
 
+* `command:` (default: `'/bin/sh'`)
+
+## Options of `.acts_as_rubyscript_executable`
+
+* `script:` (default: `:script`)
+    * if `Symbol`, the same name column's value will be evaluated as shellscript
+    * if `String`, the string will be evaluated as shellscript
+
+* `method:` (default: `ruby_execute!`)
+    * the execute method's name
+
+* `command:` (default: `'ruby'`)
+    * Set path like `'/usr/bin/ruby'`, or array to set option like `['ruby', '-c']`, `['bundle exec rails', 'r']`
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/acts_as_shellscript_executable.gemspec

@@ -21,10 +21,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
-  spec.add_development_dependency "pry"
   spec.add_development_dependency "sqlite3"
 
-  spec.required_ruby_version = '>= 1.9.3'
+  spec.required_ruby_version = '>= 2.0.0'
 
   spec.add_dependency("activerecord", [">= 4.1.6"])
 end

data/lib/acts_as_shellscript_executable/active_record/acts/shellscript_executable.rb

@@ -1,3 +1,5 @@
+require 'tempfile'
+
 module ActiveRecord
   module Acts
     module ShellscriptExecutable
@@ -6,26 +8,41 @@ module ActiveRecord
       end
 
       module ClassMethods
-        def acts_as_shellscript_executable(options = {})
-          configuration = { method: :execute!, script: :script }
-          configuration.update(options) if options.is_a?(Hash)
-          method = configuration[:method]
+        def __define_execute_method(method, type)
           class_eval <<-EOV
             def #{method}(&block)
-              script = @@__configurations__[:#{method}][:script]
+              script = @@__executable_methods__[:#{method}][:script]
+              command  = @@__executable_methods__[:#{method}][:command]
               answer = ''
-              __execute__(script, answer, block)
+              __execute__(script, :#{type}, answer, command, block)
               block_given? ? nil : answer
             end
           EOV
+        end
 
+        def __configs_set(command, script, method)
           configurations = begin
-                             class_variable_get(:@@__configurations__)
+                             class_variable_get(:@@__executable_methods__)
                            rescue NameError
                              {}
                            end
-          configurations[method] = configuration
-          class_variable_set(:@@__configurations__, configurations)
+          configurations[method] = { command: command, script: script }
+          class_variable_set(:@@__executable_methods__, configurations)
+        end
+
+        def acts_as_shellscript_executable(opt)
+          __add_method(:shell, opt)
+        end
+
+        def acts_as_rubyscript_executable(opt)
+          __add_method(:ruby, opt)
+        end
+
+        def __add_method(type, method: nil, script: :script, command: nil)
+          method ||= (type == :ruby ? :ruby_execute! : :execute!)
+          command ||= (type == :ruby ? 'ruby' : '/bin/sh')
+          __define_execute_method method, type
+          __configs_set command, script, method
           include ::ActiveRecord::Acts::ShellscriptExecutable::InstanceMethods
         end
       end
@@ -33,18 +50,24 @@ module ActiveRecord
       module InstanceMethods
         private
 
-        def __execute__(script, answer, block = nil)
+        def __execute__(script, type, answer, command, block = nil)
           script = send script if script.is_a? Symbol
+          path = __temp_script_path(script, type)
+
           retval = []
-          script.split("\n").each do |line|
-            if block
-              block.call `#{line}`
-            else
-              retval << `#{line}`
-            end
+          IO.popen([*command, path], err: [:child, :out]).each do |io|
+            block ? block.call(io) : retval << io
           end
           answer.replace retval.join
         end
+
+        def __temp_script_path(script, type)
+          Tempfile.open('') do |temp|
+            temp.puts 'STDOUT.sync = true' if type == :ruby
+            temp.puts script
+            temp.path
+          end
+        end
       end
     end
   end

data/lib/acts_as_shellscript_executable/version.rb

@@ -1,7 +1,7 @@
 module ActiveRecord
   module Acts
     module ShellscriptExecutable
-      VERSION = '0.0.3'
+      VERSION = '0.0.4'
     end
   end
 end

data/spec/features/acts_as_shellscript_executable_spec.rb

@@ -1,29 +1,29 @@
 require 'spec_helper'
 
 describe ActiveRecord::Base do
-  describe '.acts_as_shellscript_executable' do
-    def db_setup!
-      ActiveRecord::Base.establish_connection \
-        adapter: 'sqlite3', database: ':memory:'
-      ActiveRecord::Schema.verbose = false
-      ActiveRecord::Base.connection.schema_cache.clear!
-      db_schema_define!
-    end
+  def db_setup!
+    ActiveRecord::Base.establish_connection \
+      adapter: 'sqlite3', database: ':memory:'
+    ActiveRecord::Schema.verbose = false
+    ActiveRecord::Base.connection.schema_cache.clear!
+    db_schema_define!
+  end
 
-    def db_schema_define!
-      ActiveRecord::Schema.define(version: 1) do
-        create_table :scripts do |t|
-          t.column :script,  :string
-          t.column :script2, :string
-          t.column :result,  :string
-        end
+  def db_schema_define!
+    ActiveRecord::Schema.define(version: 1) do
+      create_table :scripts do |t|
+        t.column :script,  :string
+        t.column :script2, :string
+        t.column :result,  :string
       end
     end
+  end
 
-    before do
-      db_setup!
-    end
+  before do
+    db_setup!
+  end
 
+  describe '.acts_as_shellscript_executable' do
     context 'given option {script: :script}' do
       before do
         class Script < ActiveRecord::Base
@@ -104,7 +104,7 @@ describe ActiveRecord::Base do
       end
     end
 
-    context 'given option {script: "echo 1\necho 2"}' do
+    context 'given 2 options' do
       before do
         class Script < ActiveRecord::Base
           acts_as_shellscript_executable \
@@ -124,4 +124,131 @@ describe ActiveRecord::Base do
       end
     end
   end
+
+  describe '.acts_as_rubyscript_executable' do
+    context 'given option {script: :script}' do
+      before do
+        class Script < ActiveRecord::Base
+          acts_as_rubyscript_executable script: :script
+        end
+      end
+
+      it do
+        script = Script.create
+        script.script = 'puts "lalala"'
+        expect(script.ruby_execute!).to eq "lalala\n"
+      end
+    end
+
+    context 'given option {script: "puts 1\nputs 2"}' do
+      before do
+        class Script < ActiveRecord::Base
+          acts_as_rubyscript_executable script: "puts 1\nputs 2"
+        end
+      end
+
+      describe 'block given' do
+        it do
+          script = Script.create
+          watcher = []
+
+          retval = script.ruby_execute! do |each_line_result|
+            watcher << each_line_result
+          end
+
+          expect(retval).to be_nil
+          expect(watcher).to eq ["1\n", "2\n"]
+        end
+      end
+    end
+
+    context 'given option {command: ["ruby", "-c"]}' do
+      before do
+        class Script < ActiveRecord::Base
+          acts_as_rubyscript_executable \
+            script: "puts 1\nputs 2", command: ['ruby', '-c']
+        end
+      end
+
+      describe 'block given' do
+        it do
+          script = Script.create
+          watcher = []
+
+          retval = script.ruby_execute! do |each_line_result|
+            watcher << each_line_result
+          end
+
+          expect(retval).to be_nil
+          expect(watcher).to eq ["Syntax OK\n"]
+        end
+      end
+    end
+
+    context 'given option {command: "ruby"}' do
+      before do
+        class Script < ActiveRecord::Base
+          acts_as_rubyscript_executable \
+            script: "puts 1\nputs 2", command: 'ruby'
+        end
+      end
+
+      describe 'block given' do
+        it do
+          script = Script.create
+          watcher = []
+
+          retval = script.ruby_execute! do |each_line_result|
+            watcher << each_line_result
+          end
+
+          expect(retval).to be_nil
+          expect(watcher).to eq ["1\n", "2\n"]
+        end
+      end
+    end
+
+    context 'given option {command: "ruby"}, magic comment with non-ascii' do
+      before do
+        class Script < ActiveRecord::Base
+          acts_as_rubyscript_executable \
+            script: "#! coding:utf-8\nputs 1\nputs '日本語'", command: 'ruby'
+        end
+      end
+
+      describe 'block given' do
+        it do
+          script = Script.create
+          watcher = []
+
+          retval = script.ruby_execute! do |each_line_result|
+            watcher << each_line_result
+          end
+
+          expect(retval).to be_nil
+          expect(watcher).to eq ["1\n", "日本語\n"]
+        end
+      end
+    end
+
+    context 'given 2 options' do
+      before do
+        class Script < ActiveRecord::Base
+          acts_as_rubyscript_executable \
+            script: "puts 1\nputs 2"
+          acts_as_rubyscript_executable \
+            script: "puts 3\nputs 4", method: :awesome!
+        end
+      end
+
+      it do
+        script = Script.create
+        result = script.ruby_execute!
+        awesome_result = script.awesome!
+
+        expect(result).to eq "1\n2\n"
+        expect(awesome_result).to eq "3\n4\n"
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_shellscript_executable
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - hoshinotsuyoshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-23 00:00:00.000000000 Z
+date: 2014-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,20 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -128,7 +114,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="