command_butler 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0eeab5518d79fe43f062c86c4d4482d6bd906032
-  data.tar.gz: 2b1dc6526ef7c67e8513a2bd13f3a67965dcd961
+  metadata.gz: 4fcd5d2b4252f7911cf5cff13822ae8a3fc5fa62
+  data.tar.gz: 10f14973070a5a64af3ffa73e18e405a266e45f0
 SHA512:
-  metadata.gz: aab346606ee81ea6d5ae597fb076b3ea8a1792df31fd846c9a1f6d60638e84d9a40d3fb248d411ea1dd53669975cb2a16fbda498498d3c301a7c7715f7589b52
-  data.tar.gz: 985c1405eae4832f159eec2ac4d778ac9c6ced951b46152b775d5115fdf6e98075fe4c9c24b85d405558bb497d60b97fec6907154679f9040ee7828b201faa3e
+  metadata.gz: 8acbfdda96a8755884df3a438942f851a35f3dc388981d7f64edfe4701b4b5eb900169bba703add2629c4002f8c88625176dd4d736681475d9a228e5a270243c
+  data.tar.gz: 4c0026498457483612f3611146ee42435ee4f0ce687bcfd9412db822a2cc7e34d87c8f158b83458d304372434d7d00ac8308350d428041e9633b93b67bec1370

data/lib/command_butler/command_object.rb

@@ -21,6 +21,25 @@ module CommandButler
       end
     end
 
+    def execute
+      stdout =  ""
+      stderr = ""
+      status = nil
+      options = nil
+      if set_val_command?
+        stdout, stderr, status = Open3.capture3(command)
+      else
+        # その他は、都度出力されるものを表示したい
+        begin
+          system command
+        rescue => e
+          stderr = e.message
+        end
+        status = $?
+      end
+      [stdout, stderr, status]
+    end
+
     # こういうのを文字列で返したい
     # {"original_command"=>"date",
     #   "command"=>"date",

data/lib/command_butler/line_decorator.rb

@@ -1,10 +1,14 @@
 module CommandButler
   class LineDecorator
-    def self.decoration(command:command, index:index, current_index: current_index, input: input)
+    def self.decoration(command:command, index:index, current_index: current_index, history: history)
       mark = if current_index == index
                "\e[33m" +  " > "
-             elsif input
-               "\e[32m" + (input.execute?? " o " : " - ")
+             elsif history
+                if history[:result]
+                  history[:result][:status].success??  "\e[32m" + " o " :  "\e[31m" + " x "
+                else
+                  "\e[32m" + (history[:input].execute?? " o " : " - ")
+                end
              else
                "\e[37m" +  "   "
              end

data/lib/command_butler/mediator.rb

@@ -6,10 +6,12 @@ require 'command_butler/val_decorator'
 require 'command_butler/result_decorator'
 require 'command_butler/title_decorator'
 require 'command_butler/input'
+require 'open3'
 module CommandButler
   class Mediator
     def execute(file_name, options)
-      inputs = {}
+      # resultクラスも作る
+      histories = []
       @commands = CommandParser.parse(file_name:file_name)
 
       @vals = {}
@@ -28,48 +30,47 @@ module CommandButler
 
         # jumpが設定されていたらskipしたことにする
         if (index < jump_index)
-          inputs[index] = Input.skip_instance
+          histories[index] = {input: Input.skip_instance}
           next
         end
 
         # show all comamnds
-        show_commands(current_index: index, inputs: inputs) # 1件実行ごとにコマンドを表示する
+        show_commands(current_index: index, histories: histories) # 1件実行ごとにコマンドを表示する
         # execute
         input = command.need_confirm?? Input.start : Input.execute_instance
         exit 1 if input.abort?
         jump_index = (input.input_value - 1) if input.jump?
-        inputs[index] = input
-        if input.execute?
-          res = execute_command(command:command, index:index) 
-          @commands.each {|c| c.replace_command(val:res[:set_val])} if res[:set_val]
+        histories[index] = {input: input}
+        if input.execute? && command.command
+          stdout, stderr, status = execute_command(command:command, index:index) 
+          histories[index][:result] = {stdout:stdout, stderr: stderr, status: status}
+          @commands.each {|c| c.replace_command(val:{command.set_val => stdout})} if command.set_val_command?
         end
       end
     end
 
     def execute_command(command:command, index:index)
-      res = {set_val:nil}
       Dir.chdir(command.chdir) if command.chdir
-      return  res unless command.command
-      # set_valコマンドの時は標準出力を取りたいのでバッククオート実行
-      # その他は、都度出力されるものを表示したいのでsystemで実行
+      return unless command.command
 
-      ResultDecorator.decoration(command: command, index: index) do
-        if command.set_val_command?
-          val = `#{command.command}`.chomp
-          puts val
-          res[:set_val] = {command.set_val => val}
-          puts " (set_val :  #{command.set_val})"
+      # set_valコマンドの時は標準出力を取りたいのでopen3で実行
+      stdout, stderr, status = "", "", nil
+      ResultDecorator.decoration_frame(command: command, index: index) do
+        stdout, stderr, status = command.execute
+        if status.success?
+          ResultDecorator.decoration_stdout  stdout: stdout, status:status
         else
-          system command.command
+          ResultDecorator.decoration_stderr stderr: stderr, status:status
         end
       end
+
       sleep 0.5 # 表示がいっきに流れて見失しなうのでsleep
-      res
+      [stdout, stderr, status]
     end
 
-    def show_commands(current_index:current_index, inputs:inputs)
+    def show_commands(current_index:current_index, histories:histories)
       @commands.each_with_index do |command, index|
-        puts LineDecorator.decoration command: command, index: index, current_index: current_index, input: inputs[index]
+        puts LineDecorator.decoration command: command, index: index, current_index: current_index, history: histories[index]
         detail = LineDetailDecorator.decoration  command: command
         puts detail if 0 < detail.size
       end

data/lib/command_butler/result_decorator.rb

@@ -1,10 +1,20 @@
 module CommandButler
   class ResultDecorator
-    def self.decoration(command:command,index:index, &block)
-      puts head = "--  result #{index+1}" + "-" * 40
+    def self.decoration_frame(command:command,index:index, &block)
+      puts head = "--  [#{index+1}] #{command.command || command.chdir} " + "-" * 30
       yield
       puts "-" * head.length
     end
-  end
 
+    def self.decoration_stdout(stdout: stdout, status:status)
+      puts stdout
+      puts "\e[32m success status:" + status.to_i.to_s + "\e[0m"
+    end
+
+    def self.decoration_stderr(stderr: stderr, status:status)
+      puts stderr
+      puts "\e[31m error status:" + status.to_i.to_s+ "\e[0m"
+    end
+
+  end
 end

data/lib/command_butler/version.rb

@@ -1,3 +1,3 @@
 module CommandButler
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: command_butler
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - motsat
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-04 00:00:00.000000000 Z
+date: 2015-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler