ro_thor 0.2.8 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a89eaec74757ed5b7d6f6dfbc19ecf07cfd06eb
-  data.tar.gz: a7888146d0c8e14f640a6dde8f7c1df53f370a82
+  metadata.gz: 76c1ed38826537b965c5b523544136fccc42198d
+  data.tar.gz: f5d614fe5a1ec1b659e7ea348fef84a1d321014c
 SHA512:
-  metadata.gz: a9451328b5f0455ec365b8ee272015920ed5edd970a5f6cc84159bb34952a26e15f9814e46cbfb49483c231e45a5ac39b2dcddc4c5c2a56f7f3559567f28c84d
-  data.tar.gz: 2eb253567f3be13468eba74f8f19465350d4c2af4c993bd83a15f155c36d7e8f40c0f6f4377125a6b1b828430a2f024eccf59491ce01d1bc898ffb4b5a3c382c
+  metadata.gz: d61d75addbbefd742739e4ddca3ecc1316d9a6f9bc849feeef37ba00ad79a08b9c163eb1433cd0a92d9e1a842679111538c1df23bfb87d79f28ce28be82f98ba
+  data.tar.gz: 0f59eae6a48e4a6e29ebcc1e4235f1ba098bf6a67de5810dac4a6f48ce06ad6a17191f99237bd7cf87a55793e49ade82a25033fbd1b765d51a405ebd781a84bc

data/lib/ro_thor/sh.rb

@@ -0,0 +1,28 @@
+require 'thor'
+class RoThor < Thor
+  module Sh
+    class ShErr < StandardError
+    end
+
+    def sh_shutup(*args, &blk)
+      sh(*args, {shutup: true}, &blk)
+    end
+
+    def sh(*args, &blk)
+      opts = args.extract_options!
+      cmd = args.join("")
+      puts "run '#{cmd}'"
+      out, err, status = Open3.capture3(cmd)
+
+      unless opts[:shutup]
+        puts out
+      end
+
+      unless status.success?
+        raise ShErr, err
+      end
+
+      out
+    end
+  end
+end

data/lib/ro_thor.rb

@@ -3,8 +3,11 @@ $LOAD_PATH.unshift(Pathname.new(__FILE__).parent.to_s)
 require 'ro_thor/array'
 require 'thor'
 require 'open3'
+require 'ro_thor/sh'
 
 class RoThor < Thor
+  include ::RoHelper::Sh
+
   class << self
     def usg(str, *args, &blk)
       desc(str, "")
@@ -26,7 +29,7 @@ class RoThor < Thor
     cmd = args.join(" ")
     puts "run '#{cmd}'"
     if spork?
-      bash cmd
+      sh cmd
     else
       system cmd
     end
@@ -50,7 +53,7 @@ class RoThor < Thor
 
   def read(f, *args, &blk)
     if rmt?
-      bash "sudo cp -f #{f} #{buffer}"
+      sh "sudo cp -f #{f} #{buffer}"
       File.read(buffer)
     else
       File.read(f)
@@ -79,34 +82,12 @@ class RoThor < Thor
     if rmt?
       File.binwrite(buffer, *args, &blk)
       pr = Pathname.new(f).parent
-      bash("sudo mkdir -p #{pr}; sudo cp -f #{buffer} #{f}")
+      sh("sudo mkdir -p #{pr}; sudo cp -f #{buffer} #{f}")
     else
       File.binwrite(f, *args, &blk)
     end
   end
 
-  class BashErr < StandardError
-  end
-
-  def bash_shutup(*args, &blk)
-    bash(*args, shutup: true, &blk)
-  end
-
-  def bash(*args, &blk)
-    opts = args.extract_options!
-    cmd = args.join("")
-    puts "run '#{cmd}'"
-    out, err, status = Open3.capture3(cmd)
 
-    unless opts[:shutup]
-      puts out
-    end
-
-    unless status.success?
-      raise BashErr, err
-    end
-
-    out
-  end
 end
 

data/spec/lib/core_ext/array_spec.rb

@@ -3,9 +3,8 @@ require 'spec_helper'
 class TryArr < RoThor
   def opts(*args, &blk)
     args, opts = args.ro_opts
-    return opts
+    opts
   end
-
 end
 
 describe "RoThor.new" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ro_thor
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - ''
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-06 00:00:00.000000000 Z
+date: 2015-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -33,6 +33,7 @@ extra_rdoc_files: []
 files:
 - lib/ro_thor.rb
 - lib/ro_thor/array.rb
+- lib/ro_thor/sh.rb
 - spec/lib/core_ext/array_spec.rb
 - spec/mysql/my.cnf
 - spec/spec_helper.rb