jr-cli 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7fbe53abe97c6501e6e1d78f1bfdded7ef8cfd97
-  data.tar.gz: 3cd6173a84e84c40e856c56a7638197f3764d9f9
+  metadata.gz: bf4bfddefb27afc5dbc464a2ae44bbc536dadd0d
+  data.tar.gz: 3af064b0674b03eccd4ea025f4d70e956e75e8ad
 SHA512:
-  metadata.gz: 23149a324db87a7cc6dee03e34bdde6f30d679c69fd77c73ec9f37f7cb93205e2a01bf8a1c6c65640ea3f8e5f9a7a6584f8ed6c30d734ae59d9ca27e58b99396
-  data.tar.gz: a3e3aebf4c2ae87f9e80dc4bd4ff76127ba27c8bfb34ea67386af1c2c6ca21c7fe9651badaa6b275ad19f3d959fcf3d7413eccf704ffe533a148c2b82281ca1c
+  metadata.gz: 31956edb39542e71796909a3b3c5c817f1b2073f1c98573deaf5ddc5a3835041e5708daeee7495dd0639db64cb7bd8f421f85b36e294c2522f32095b453ba915
+  data.tar.gz: 64e5a7e4249d42a2567e57f664d28427454c7c5ec0e9b1407903a7db9bc50463238807c74b7f0fd1903b98006044d51d4dda26ef7e0f6a17f99b613f36757c77

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.3.0 (2015-08-28)
+
+* Add `--raw-input` option
+* Add `--color-output` option
+* Add `--monochrome-output` option
+* Do indentation when filter is omitted
+
 ## 0.2.0 (2015-08-19)
 
 * [BREAKING CHANGE] Now `-r` is alias for `--raw-output` and use `--require` to require library

data/README.md

@@ -34,9 +34,12 @@ You can also read JSON not from files but from STDIN.
 ```
         --require FILE               require the FILE before execution
     -c, --compact-output             output each JSON in single line
+    -f, --from-file FILE             read filter from file
     -r, --raw-output                 output strings as raw output
+    -R, --raw-input                  read each line as string
     -C, --color-output               output with colors even if writing to a pipe or a file
     -M, --monochrome-output          output without colors
+    -n, --null-input                 use null as input instead of any files
 ```
 
 ## jr filter tutorial
@@ -64,7 +67,7 @@ $ jr 'unwrap' repos.json
 `Enumerable` has many useful methods and you can transform data with them.
 
 ```
-$j r 'unwrap.group_by(&:language).map{|k, v| [k, v.size] }.sort_by{|k, v| -v }' repos.json
+$ jr 'unwrap.group_by(&:language).map{|k, v| [k, v.size] }.sort_by{|k, v| -v }' repos.json
 [
   "Ruby",
   28

data/bin/jr

@@ -10,28 +10,58 @@ opt = OptionParser.new
 opt.banner  = "jr - Command-line JSON processor for Rubyists [Ver. #{Jr::Cli::VERSION}]\n\n" +
               "Usage: jr [options] <jr filter> [file...]"
 opt.version = Jr::Cli::VERSION
-opt.on('--require FILE', 'require the FILE before execution') {|file| require file }
+opt.on('--require FILE',            'require the FILE before execution')                      { |file| require file }
 pretty = true
-opt.on('-c', '--compact-output', 'output each JSON in single line') { pretty = false }
+opt.on('-c', '--compact-output',    'output each JSON in single line')                        { pretty = false }
+from_file = false
+filter_file = nil
+opt.on('-f', '--from-file FILE',    'read filter from file')                                  { |file| from_file = true; filter_file = file }
 raw_output = false
-opt.on('-r', '--raw-output', 'output strings as raw output') { raw_output = true }
+opt.on('-r', '--raw-output',        'output strings as raw output')                           { raw_output = true }
+raw_input = false
+opt.on('-R', '--raw-input',         'read each line as string')                               { raw_input = true }
 color_output = STDOUT.tty?
-opt.on('--color-output', '-C', 'output with colors even if writing to a pipe or a file') { color_output = true }
-opt.on('--monochrome-output', '-M', 'output without colors') { color_output = false }
+opt.on('-C', '--color-output',      'output with colors even if writing to a pipe or a file') { color_output = true }
+opt.on('-M', '--monochrome-output', 'output without colors')                                  { color_output = false }
+null_input = false
+opt.on('-n', '--null-input',        'use null as input instead of any files')                 { null_input = true }
 opt.parse! ARGV
 
 require 'jr/cli/core_ext'
 
 trap('INT') { exit 130 }
 
-inputs = ARGV[1] ? ARGV[1..-1].map {|f| open f } : [STDIN]
-result = Enumerator.new do |yielder|
-  inputs.each do |input|
-    Yajl::Parser.new(symbolize_keys: true).parse(input) do |d|
-      yielder.yield d
-    end
+if from_file
+  inputs = ARGV[0] ? ARGV[0..-1].map {|f| open f } : [STDIN]
+  jr_filter = open(filter_file).read
+else
+  inputs = ARGV[1] ? ARGV[1..-1].map {|f| open f } : [STDIN]
+  jr_filter = ARGV[0] || 'self'
+end
+
+if null_input
+  input_enumerator = [nil]
+else
+  if raw_input
+    input_enumerator = Enumerator.new do |yielder|
+      inputs.each do |input|
+        input.each_line do |line|
+          yielder.yield line.chop
+        end
+      end
+    end.lazy
+  else
+    input_enumerator = Enumerator.new do |yielder|
+      inputs.each do |input|
+        Yajl::Parser.new(symbolize_keys: true).parse(input) do |d|
+          yielder.yield d
+        end
+      end
+    end.lazy
   end
-end.lazy.instance_eval(ARGV[0])
+end
+
+result = input_enumerator.instance_eval(jr_filter)
 
 encoder = Yajl::Encoder.new(pretty: pretty)
 print_json = ->(data) do

data/features/json_processing.feature

@@ -2,6 +2,28 @@ Feature: JSON processing
 
   jr is jq like JSON processor for Rubyist
 
+  Scenario: Indent JSON
+    Given a file named "input.json" with:
+    """
+    {"name":"foo"}
+    {"name":"bar"}
+    {"name":"baz"}
+    """
+    When I run `cat input.json | jr` in bash
+    Then the output should contain exactly:
+    """
+    {
+      "name": "foo"
+    }
+    {
+      "name": "bar"
+    }
+    {
+      "name": "baz"
+    }
+
+    """
+
   Scenario: Filter single JSON of Object
     Given a file named "input.json" with:
     """
@@ -245,3 +267,86 @@ Feature: JSON processing
     baz
 
     """
+
+  Scenario: Read each line as string using --raw-input option
+    Given a file named "input.json" with:
+    """
+    foo
+    bar
+    baz
+
+    """
+    When I run `jr --raw-input 'self' input.json`
+    Then the output should contain exactly:
+    """
+    "foo"
+    "bar"
+    "baz"
+
+    """
+
+  Scenario: Read filter from file using -f option.
+    Given a file named "input.json" with:
+    """
+    {"ua":"Mozilla/5.0 (compatible; Googlebot/2.1; +http://www.google.com/bot.html)"}
+    {"ua":"Mozilla/5.0 (iPhone; CPU iPhone OS 5_0_1 like Mac OS X) AppleWebKit/534.46 (KHTML, like Gecko) Version/5.1 Mobile/9A405 Safari/7534.48.3"}
+    {"ua":"Mozilla/5.0 (Macintosh; Intel Mac OS X 10.7; rv:21.0) Gecko/20100101 Firefox/21.0"}
+
+    """
+    And a file named "filter.rb" with:
+    """
+    require 'woothee'
+
+    select { |j| not Woothee.is_crawler(j.ua) }
+      .map { |j| Woothee.parse(j.ua).name }
+    """
+    When I run `jr -f filter.rb input.json`
+    Then the output should contain exactly:
+    """
+    "Safari"
+    "Firefox"
+
+    """
+
+  Scenario: Read filter from file using --from-file option.
+    Given a file named "input.json" with:
+    """
+    {"ua":"Mozilla/5.0 (compatible; Googlebot/2.1; +http://www.google.com/bot.html)"}
+    {"ua":"Mozilla/5.0 (iPhone; CPU iPhone OS 5_0_1 like Mac OS X) AppleWebKit/534.46 (KHTML, like Gecko) Version/5.1 Mobile/9A405 Safari/7534.48.3"}
+    {"ua":"Mozilla/5.0 (Macintosh; Intel Mac OS X 10.7; rv:21.0) Gecko/20100101 Firefox/21.0"}
+
+    """
+    And a file named "filter.rb" with:
+    """
+    require 'woothee'
+
+    select { |j| not Woothee.is_crawler(j.ua) }
+      .map { |j| Woothee.parse(j.ua).name }
+    """
+    When I run `jr --from-file filter.rb input.json`
+    Then the output should contain exactly:
+    """
+    "Safari"
+    "Firefox"
+
+    """
+
+  Scenario: Read no file and build JSONs from scratch using --null-input option.
+    When I run `jr --null-input '1.upto(3).map{ |n| "%02d" % n }'`
+    Then the output should contain exactly:
+    """
+    "01"
+    "02"
+    "03"
+
+    """
+
+  Scenario: Read no file and build JSONs from scratch using -n option.
+    When I run `jr -n '1.upto(3).map{ |n| "%02d" % n }'`
+    Then the output should contain exactly:
+    """
+    "01"
+    "02"
+    "03"
+
+    """

data/features/step_definitions/command_steps.rb

@@ -0,0 +1,4 @@
+When(/^I run `([^`]*)` in bash$/)do |cmd|
+  cmd = "bash -c '%s'" % unescape_text(unescape_text(cmd))
+  run_simple(cmd, false)
+end

data/jr-cli.gemspec

@@ -18,15 +18,15 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "yajl-ruby"
-  spec.add_runtime_dependency "coderay"
+  spec.add_runtime_dependency "yajl-ruby", "~> 1.2.1"
+  spec.add_runtime_dependency "coderay", "~> 1.1.0"
 
   spec.add_development_dependency "bundler", "~> 1.6"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "test-unit"
-  spec.add_development_dependency "aruba"
-  spec.add_development_dependency "guard"
-  spec.add_development_dependency "guard-test"
-  spec.add_development_dependency "guard-cucumber"
-  spec.add_development_dependency "woothee"
+  spec.add_development_dependency "rake", "~> 10.4.2"
+  spec.add_development_dependency "test-unit", "~> 3.1.3"
+  spec.add_development_dependency "aruba", "0.9.0"
+  spec.add_development_dependency "guard", "~> 2.13.0"
+  spec.add_development_dependency "guard-test", "~> 2.0.6"
+  spec.add_development_dependency "guard-cucumber", "~> 1.6.0"
+  spec.add_development_dependency "woothee", "~> 1.2.0"
 end

data/lib/jr/cli/version.rb

@@ -1,5 +1,5 @@
 module Jr
   module Cli
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: jr-cli
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Yuya Takeyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-18 00:00:00.000000000 Z
+date: 2015-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: coderay
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -56,100 +56,100 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.4.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.4.2
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.1.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.1.3
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.13.0
 - !ruby/object:Gem::Dependency
   name: guard-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.6
 - !ruby/object:Gem::Dependency
   name: guard-cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: woothee
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.0
 description: jr is jq like JSON processor. Its script can be written in Ruby
 email:
 - sign.of.the.wolf.pentagram@gmail.com
@@ -169,6 +169,7 @@ files:
 - bin/jr
 - features/core_ext.feature
 - features/json_processing.feature
+- features/step_definitions/command_steps.rb
 - features/support/env.rb
 - jr-cli.gemspec
 - lib/jr/cli/core_ext.rb
@@ -209,6 +210,7 @@ summary: 'jr: command-line JSON processor for Rubyists'
 test_files:
 - features/core_ext.feature
 - features/json_processing.feature
+- features/step_definitions/command_steps.rb
 - features/support/env.rb
 - test/unit/core_ext/enumerable_test.rb
 - test/unit/core_ext/enumerator_test.rb