ru2 2.1.5 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24b06ee55e0f75bacdc2cd2f24a26ef4b68639e0
-  data.tar.gz: fb590fdf5fab06a173cb904b461ff37143a18373
+  metadata.gz: 08379b07d4eaba821c0b311b301f31a510a4c55a
+  data.tar.gz: c719ae44d9738abbc270eccf55a3d8c668fce5f9
 SHA512:
-  metadata.gz: b5dae726d2b6e487e17a9eeba3e97bddad021061c2b01c30542a2db8f7eb0cea62b700427f292d729b2149f09d205f16a91aad355835b921cd19d98e263172f3
-  data.tar.gz: f3fc078d8b72c90ec463d9c0e90d09e96294bc655c5ee8a52b5fea7a87a3f3b11f9d475f8c0797b27766c00e93a2d02a127131eac98b84cb638277182ec16080
+  metadata.gz: f4c283b44df3305650164ede3763cddcd902229cc90b6cb39b05b969e1f8c21c5f50942b7ed83255990e4fb2f1a02b3eb9d074bfe4569e3045f9f71a71d1ae31
+  data.tar.gz: 0c2bfdd5c341663051cf9bd0900ab994d0fffde0d77266046676ec1b89bc2cdfd282702be7b3afaef900296ea0dfa99f0cadaaa8f77a5d27796831bde4ea241b

data/README.md

@@ -89,10 +89,10 @@ $ ru 'map(:to_i).sum' myfile myfile
 10
 ```
 
-You can also run Ruby code without any input by prepending a `! `:
+You can also run Ruby code without any input by prepending a `=`:
 
 ```bash
-$ ru '! 2 + 3'
+$ ru '=2 + 3'
 5
 ```
 

data/gemfiles/activesupport_3.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
-  remote: ../
+  remote: ..
   specs:
-    ru2 (2.1.5)
+    ru2 (2.2.0)
       activesupport (>= 3.2.0)
 
 GEM
@@ -43,4 +43,4 @@ DEPENDENCIES
   ru2!
 
 BUNDLED WITH
-   1.13.6
+   1.14.3

data/gemfiles/activesupport_4.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
-  remote: ../
+  remote: ..
   specs:
-    ru2 (2.1.5)
+    ru2 (2.2.0)
       activesupport (>= 3.2.0)
 
 GEM
@@ -50,4 +50,4 @@ DEPENDENCIES
   ru2!
 
 BUNDLED WITH
-   1.13.6
+   1.14.3

data/gemfiles/activesupport_5.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
-  remote: ../
+  remote: ..
   specs:
-    ru2 (2.1.5)
+    ru2 (2.2.0)
       activesupport (>= 3.2.0)
 
 GEM
@@ -49,4 +49,4 @@ DEPENDENCIES
   ru2!
 
 BUNDLED WITH
-   1.13.6
+   1.14.3

data/lib/ru/process.rb

@@ -19,8 +19,8 @@ module Ru
         return
       end
 
-      @stdin = get_stdin(args, @options[:stream]) unless @code.start_with?('! ')
-      @code  = prepare_code(@code)
+      @parsed = prepare_code(@code)
+      @stdin  = get_stdin(args, @options[:stream]) if @parsed[:get_stdin]
 
       context =
         if @stdin.nil?
@@ -42,7 +42,9 @@ module Ru
             end
           end
         end
-      output  = context.instance_eval(@code) || @stdin
+
+      output = context.instance_eval(@parsed[:code])
+      output = @stdin if output == nil
 
       prepare_output(output)
     end
@@ -50,14 +52,17 @@ module Ru
     private
 
     def prepare_code(code)
-      if code.kind_of?(String)
-        if code.start_with?('[')
-          code = 'to_self' + code
-        elsif code.start_with?('! ')
-          code = code[2..-1]
-        end
+      return code unless code.kind_of?(String)
+      if code.start_with?('[')
+        { code: "to_self#{code}", get_stdin: true }
+      elsif code.start_with?('=')
+        { code: code[1..-1], get_stdin: false }
+      elsif code.start_with?('!')
+        ActiveSupport::Deprecation.warn %('!1+2' syntax is going to be replaced with '=1+2')
+        { code: code[1..-1], get_stdin: false }
+      else
+        { code: code, get_stdin: true }
       end
-      code
     end
 
     def prepare_output(output)

data/lib/ru/version.rb

@@ -1,3 +1,3 @@
 module Ru
-  VERSION = '2.1.5'
+  VERSION = '2.2.0'
 end

data/spec/lib/process_spec.rb

@@ -57,8 +57,8 @@ describe Ru::Process do
       expect(out).to eq("foo\nfoo\nfoo")
     end
 
-    it "runs code prepended by '! '" do
-      out = run('! 2 + 3')
+    it "runs code prepended by '='" do
+      out = run('=2 + 3')
       expect(out).to eq('5')
     end
 

data/spec/support/fixtures_helper.rb

@@ -1,3 +1,5 @@
+require 'pathname'
+
 module FixturesHelper
   def fixture_path(*args)
     directory = Pathname.new(File.dirname(File.absolute_path(__FILE__)))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ru2
 version: !ruby/object:Gem::Version
-  version: 2.1.5
+  version: 2.2.0
 platform: ruby
 authors:
 - Tom Benner
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-27 00:00:00.000000000 Z
+date: 2017-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -120,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Ruby in your shell!