ppcommand 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b056394e4ded505fc8f3504c999b3b4f58151c03
-  data.tar.gz: 3d4c6f399311cd0875c843b8bc15bb284eff3921
+  metadata.gz: f7bc8dfd32503c7ff22d467c184aeac1366a8b72
+  data.tar.gz: cdb3f08a20e3fa47cdb493eea9f5458d33f1a9bb
 SHA512:
-  metadata.gz: 69b02307466c3f2f695c9b0cbe4d5775604d31c5bd6f00ccd325a7f69b6bcdd76e1005671d08337cc5b61899f758c42768c210b33917c7bc69c3048734db1f10
-  data.tar.gz: 143396ef13ff69181955a997acbcd147fcdd06a470163e30e91d2be4d5f6117fac9701cce1632727a73a97c738b001fb897d283721119cae12d6b60a21886537
+  metadata.gz: 9e9d4f088daafe444b25525146e1a36c8df8416dbcf30b32a4c184f4f61783f6a46eb1abbc1f19ecc757afd7cbce11249437c7754a3d8fc847c2a637d11f1560
+  data.tar.gz: 9e49d51412e675c5cb225b9f4ea0b476df5d7a7eb4612558cdeecd30824e05d5d042a12d1da7d161f0ea8b1d94ba30900a568729d28a7ce40a03a151bc12439a

data/lib/ppcommand/cli.rb

@@ -0,0 +1,41 @@
+# coding: utf-8
+
+require 'optparse'
+require 'ppcommand/main'
+require 'open-uri'
+
+module PPCommand
+
+  class CLI
+    def self.execute(argv)
+      opts = {:type => "auto"}
+      opp = OptionParser.new
+
+      opp.banner = "pp [options] [file|URI]"
+      opp.on_tail("-h", "--help", "show this help.") do
+        puts opp
+        exit
+      end
+      opp.on_tail("-v", "--version", "show version.") do
+        puts "ppcommand #{ PPCommand::VERSION }"
+        exit
+      end
+
+      opp.on("-c", "--csv", "parse CSV and pp."){|x| opts[:type] = "csv"}
+      opp.on("-C", "--csvtable", "parse CSV, add labels and pp."){|x| opts[:type] = "csvtable"}
+      opp.on("-H", "--html", "parse HTML and pp."){|x| opts[:type] = "html"}
+      opp.on("-j", "--json", "parse JSON and pp."){|x| opts[:type] = "json"}
+      opp.on("-x", "--xml", "parse XML using REXML and pp."){|x| opts[:type] = "xml"}
+      opp.on("-X", "--xmlsimple", "parse XML using XMLSimple and pp."){|x| opts[:type] = "xmlsimple"}
+      opp.on("-y", "--yaml", "parse YAML and pp."){|x| opts[:type] = "yaml"}
+
+      opp.on("-t", "--text", "do not parse. print plain text."){|x| opts[:type] = "text"}
+
+      opp.parse!(argv)
+
+      file = argv.shift
+
+      PPCommand::Main.new.execute(opts, file)
+    end
+  end
+end

data/lib/ppcommand/main.rb

@@ -1,11 +1,69 @@
 # coding: utf-8
 
-require 'pp'
+require 'awesome_print'
 require 'yaml'
-require 'optparse'
 
 module PPCommand
   class Main
+    def execute(opts, file)
+      source = ''
+      if file.nil?
+        source = STDIN.read
+      elsif file=~ %r{^https?://}
+        open(file) do |io|
+          source = io.read
+          if opts[:type] == "auto"
+            t = io.content_type
+            if t =~ /json/
+              opts[:type] = "json"
+            elsif t =~ /yaml/
+              opts[:type] = "yaml"
+            elsif t =~ /csv/
+              opts[:type] = "csv"
+            elsif t =~ /html/
+              opts[:type] = "html"
+            elsif t =~ /xml/
+              opts[:type] = "xml"
+            end
+          end
+        end
+      else
+        source = File.read(file)
+      end
+
+      if opts[:type] == "auto"
+        if file =~ /\.xml$/i
+          opts[:type] = "xml"
+        elsif file =~ /\.json$/i
+          opts[:type] = "json"
+        elsif file =~ /\.(?:csv|txt)$/i
+          opts[:type] = "csv"
+        elsif file =~ /\.html$/i
+          opts[:type] = "html"
+        else
+          opts[:type] = "yaml"
+        end
+      end
+
+      case opts[:type]
+      when "xml"
+        pp_xml(source)
+      when "xmlsimple"
+        pp_xmlsimple(source)
+      when "json"
+        pp_json(source)
+      when "csv"
+        pp_csv(source)
+      when "csvtable"
+        pp_csvtable(source)
+      when "html"
+        pp_html(source)
+      when "text"
+        puts source
+      else "yaml"
+        pp_yaml(source)
+      end
+    end
 
     def pp_xml(source)
       require 'rubygems'
@@ -16,24 +74,24 @@ module PPCommand
     def pp_xmlsimple(source)
       require 'rubygems'
       require 'xmlsimple'
-      pp XmlSimple.xml_in(source)
+      ap XmlSimple.xml_in(source)
     end
 
     def pp_json(source)
       require 'rubygems'
       require 'json'
-      pp JSON.parse(source)
+      ap JSON.parse(source)
     end
 
     def pp_yaml(source)
       YAML.each_document(StringIO.new(source)) do |obj|
-        pp obj
+        ap obj
       end
     end
 
     def pp_csv(source)
       require 'csv'
-      pp CSV.parse(source)
+      ap CSV.parse(source)
     end
 
     def pp_csvtable(source)
@@ -54,7 +112,7 @@ module PPCommand
         end
         result << entry
       end
-      pp result
+      ap result
       # data.map {|values| Hash[* [keys,values].transpose.flatten] }
     end
 
@@ -68,95 +126,7 @@ module PPCommand
       end
       doc = Nokogiri.HTML(source)
       # doc.serialize(:encoding => 'UTF-8', :save_with =>  Nokogiri::XML::Node::SaveOptions::FORMAT | Nokogiri::XML::Node::SaveOptions::AS_XML)
-      pp doc
-    end
-
-    def execute(argv)
-      opts = {:type => "auto"}
-      opp = OptionParser.new
-
-      opp.banner = "pp [options] [file|URI]"
-      opp.on_tail("-h", "--help", "show this help.") do
-        puts opp
-        exit
-      end
-      opp.on_tail("-v", "--version", "show version.") do
-        puts "ppcommand #{ PPCommand::VERSION }"
-        exit
-      end
-
-      opp.on("-c", "--csv", "parse CSV and pp."){|x| opts[:type] = "csv"}
-      opp.on("-C", "--csvtable", "parse CSV, add labels and pp."){|x| opts[:type] = "csvtable"}
-      opp.on("-H", "--html", "parse HTML and pp."){|x| opts[:type] = "html"}
-      opp.on("-j", "--json", "parse JSON and pp."){|x| opts[:type] = "json"}
-      opp.on("-x", "--xml", "parse XML using REXML and pp."){|x| opts[:type] = "xml"}
-      opp.on("-X", "--xmlsimple", "parse XML using XMLSimple and pp."){|x| opts[:type] = "xmlsimple"}
-      opp.on("-y", "--yaml", "parse YAML and pp."){|x| opts[:type] = "yaml"}
-
-      opp.on("-t", "--text", "do not parse. print plain text."){|x| opts[:type] = "text"}
-
-      opp.parse!(argv)
-
-      file = argv.shift
-
-      source = ""
-      if file.nil?
-        source = STDIN.read
-      elsif file=~ %r{^https?://}
-        require 'open-uri'
-        open(file) do |io|
-          source = io.read
-          if opts[:type] == "auto"
-            t = io.content_type
-            if t =~ /json/
-              opts[:type] = "json"
-            elsif t =~ /yaml/
-              opts[:type] = "yaml"
-            elsif t =~ /csv/
-              opts[:type] = "csv"
-            elsif t =~ /html/
-              opts[:type] = "html"
-            elsif t =~ /xml/
-              opts[:type] = "xml"
-            end
-          end
-        end
-      else
-        source = File.read(file)
-      end
-
-      if opts[:type] == "auto"
-        if file =~ /\.xml$/i
-          opts[:type] = "xml"
-        elsif file =~ /\.json$/i
-          opts[:type] = "json"
-        elsif file =~ /\.(?:csv|txt)$/i
-          opts[:type] = "csv"
-        elsif file =~ /\.html$/i
-          opts[:type] = "html"
-        else
-          opts[:type] = "yaml"
-        end
-      end
-
-      case opts[:type]
-      when "xml"
-        pp_xml(source)
-      when "xmlsimple"
-        pp_xmlsimple(source)
-      when "json"
-        pp_json(source)
-      when "csv"
-        pp_csv(source)
-      when "csvtable"
-        pp_csvtable(source)
-      when "html"
-        pp_html(source)
-      when "text"
-        puts source
-      else "yaml"
-        pp_yaml(source)
-      end
+      ap doc
     end
 
     # original from http://snippets.dzone.com/posts/show/4953

data/lib/ppcommand/version.rb

@@ -1,3 +1,3 @@
 module PPCommand
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

data/lib/ppcommand.rb

@@ -1,8 +1,8 @@
-require "ppcommand/version"
-require "ppcommand/main"
+require 'ppcommand/version'
+require 'ppcommand/cli'
 
 module PPCommand
   def self.execute
-    PPCommand::Main.new.execute(ARGV)
+    PPCommand::CLI.execute(ARGV)
   end
 end

data/ppcommand.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'xml-simple'
+  spec.add_dependency 'awesome_print'
 
   spec.add_development_dependency 'bundler', '~> 1.6'
   spec.add_development_dependency 'rake'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ppcommand
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - KOSEKI Kengo
@@ -24,6 +24,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: awesome_print
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -83,6 +97,7 @@ files:
 - VERSION
 - bin/pp
 - lib/ppcommand.rb
+- lib/ppcommand/cli.rb
 - lib/ppcommand/main.rb
 - lib/ppcommand/version.rb
 - ppcommand.gemspec