vim_printer 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5db6c8f84609703178fb48f9917034197fe3a0f3
-  data.tar.gz: 7e764609c4a0860849ac65cfb9e57e2195886439
+  metadata.gz: 8e112f2fc25ae31c97cc8df1dc09168fa5934bd5
+  data.tar.gz: fb5772428a7b8868cf0ce7adce87c4c1107a3496
 SHA512:
-  metadata.gz: ee03cbf46d41b1e06a9d3d0c92532471f663de84fd06c038f72872e64c75d84a2078d0305a349c466895a486c065ae842d621f54a7c344b3f9a3d74f46fb3556
-  data.tar.gz: 38485f6aec3fd9f5340804b71fcb9d370c258bc4ab6d07d6dd7adeb015abde08319912042f59a0d1b9d8ad29c9db6e9f13c810cbe53bc7efc6afca38ea200c73
+  metadata.gz: 6e8cdd0bfa89eba6960496219de7831f0c3bab4b418e3e6cbee24f631b40e255a35ae98766cba5f949cfba38c0655fbcdd700e299638ffac3874d84d915f05a0
+  data.tar.gz: bbb3ad595c2b44e1ed902c008450a9d707293fe9a7d06b0fe6271eaf96dd061ebc9ac924eb55649dd71a76b1f34d3f18263cb948a00c394d9538145858abc0e7

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ### Changelog
 
+#### 0.1.10
+
+- Rename `--shell-command` to `--command` [Improvement]
+- Move the logic to `code_lister` gem
+
 #### 0.1.9
 
 - Add advance `--shell_command` option to get the input file list from the the shell command [New]

data/README.md

@@ -134,9 +134,9 @@ Usage:
   vim_printer
 
 Options:
-  -b, [--base-dir=BASE_DIR]                # Base directory (mandatory)
+  -b, [--base-dir=BASE_DIR]                # Base directory
                                            # Default: . (current directory)
-  -e, [--exts=one two three]               # List of extension to search for (mandatory)
+  -e, [--exts=one two three]               # List of extension to search for
                                            # e.g. -e rb md
   -f, [--non-exts=one two three]           # List of file without extension to be included in the result (optional)
                                            # e.g. -f Gemfile LICENSE
@@ -151,16 +151,18 @@ Options:
   -r, [--recursive], [--no-recursive]      # Search for files recursively (optional)
                                            # Default: --recursive
   -v, [--version]                          # Display version information
+                                           #
   -t, [--theme=THEME]                      # Vim colorscheme to use (optional)
                                            # Default: 'default'
   -c, [--index], [--no-index]              # Generate the index.html file for the result (optional)
                                            # Default: --index
-  -s, [--shell-command]                    # Use the input file list from the result of the given shell command (optional)
-                                           # Note: the command must be result in the list of files
+  -s, [--command]                          # Use the input file list from the result of the given shell command
+                                           # Note: the command must return the list of file to be valid
                                            # This option ignore any of the following options -e, -f, -n, -x, -i if specified
-                                           # e.g. --shell-command 'git diff --name-only HEAD~2 | grep -v test'
-                                           # e.g. --shell-command 'find . -type f -iname "*.rb" | grep -v test'
+                                           # e.g. --command 'git diff --name-only HEAD~2 | grep -v test'
+                                           # e.g. --command 'find . -type f -iname "*.rb" | grep -v test | grep -v _spec'
 Print files to (x)html using Vim
+
 ```
 
 ### Customization for output options

data/lib/vim_printer/cli.rb

@@ -26,10 +26,9 @@ module VimPrinter
                   desc:    "Generate the index.html file for the result",
                   type:    :boolean,
                   default: true
-    method_option :shell_command,
+    method_option :command,
                   aliases: "-s",
-                  desc: "Use input file list from the result of the given shell command",
-                  type: :string
+                  desc: "Use input file list from the result of the given shell command"
     def print
       opts = options.symbolize_keys
       if opts[:version]
@@ -46,9 +45,9 @@ Usage:
   vim_printer
 
 Options:
-  -b, [--base-dir=BASE_DIR]                # Base directory (mandatory)
+  -b, [--base-dir=BASE_DIR]                # Base directory
                                            # Default: . (current directory)
-  -e, [--exts=one two three]               # List of extension to search for (mandatory)
+  -e, [--exts=one two three]               # List of extension to search for
                                            # e.g. -e rb md
   -f, [--non-exts=one two three]           # List of file without extension to be included in the result (optional)
                                            # e.g. -f Gemfile LICENSE
@@ -63,15 +62,16 @@ Options:
   -r, [--recursive], [--no-recursive]      # Search for files recursively (optional)
                                            # Default: --recursive
   -v, [--version]                          # Display version information
+                                           #
   -t, [--theme=THEME]                      # Vim colorscheme to use (optional)
                                            # Default: 'default'
   -c, [--index], [--no-index]              # Generate the index.html file for the result (optional)
                                            # Default: --index
-  -s, [--shell-command]                    # Use the input file list from the result of the given shell command (optional)
-                                           # Note: the command must be result in the list of files
+  -s, [--command]                          # Use the input file list from the result of the given shell command
+                                           # Note: the command must return the list of file to be valid
                                            # This option ignore any of the following options -e, -f, -n, -x, -i if specified
-                                           # e.g. --shell-command 'git diff --name-only HEAD~2 | grep -v test'
-                                           # e.g. --shell-command 'find . -type f -iname "*.rb" | grep -v test | grep -v _spec'
+                                           # e.g. --command 'git diff --name-only HEAD~2 | grep -v test'
+                                           # e.g. --command 'find . -type f -iname "*.rb" | grep -v test | grep -v _spec'
 Print files to (x)html using Vim
       EOS
     end
@@ -81,49 +81,20 @@ Print files to (x)html using Vim
 
   private
 
-    # Get the appropriate input from the options
+    # Get the list of input file
     #
     # @param [Hash<Symbol, Object>] args the input options
-    # @option args [String] :shell_input the shell input string if any
+    # @option args [String] :command the shell command to be used to get list of files
     # @return [Array<String>] list of files in the format
-    #
-    #   ["./Gemfile", "./lib/vim_printer/cli.rb", ..]
+    #         ["./Gemfile", "./lib/vim_printer/cli.rb", ..]
     def get_input_files(args = {})
-      shell_command = args.fetch(:shell_command, nil)
-      if shell_command.nil?
-        # use other options if we don't use the '--shell-input' option
+      command  = args.fetch(:command, nil)
+      base_dir = args[:base_dir]
+      if command.nil?
         CodeLister.files(args)
       else
-        files_from_shell_command(shell_command, args[:base_dir])
-      end
-    end
-
-    # Execute the command in the shell and return the output list for use
-    # e.g. `git diff --name-only HEAD~1` is getting the list of files that have been
-    # updated in the last commit
-    #
-    # @param [String] shell_input the input command to be executed in the shell
-    # @param [String] base_dir the starting directory
-    # @return [Array<String>] file list or empty list if the shell command is not valid
-    def files_from_shell_command(command, base_dir)
-      files = AgileUtils::Helper.shell(command.split(" ")).split(/\n/)
-      # Adapt the result and make sure that it start with "./"
-      # like the result from 'CodeLister.files()' method
-      files.map! do |file|
-        if file =~ /^\.\//
-          # skip if the file start with './' string
-          file
-        else
-          # add './' to the one that does not already have one
-          "./#{file}"
-        end
+        CodeLister.files_from_command(command, base_dir)
       end
-      # Note: this make sure that it work with deleted file when use
-      # this with 'git diff --name-only HEAD~2'
-      files.delete_if { |file| !File.exist?(file.gsub(/^\./, base_dir)) }
-    rescue RuntimeError => e
-      # just return the empty list, if the user specified invalid command for 'shell_input' option
-      return []
     end
 
     # Main entry point to export the code

data/lib/vim_printer/version.rb

@@ -1,3 +1,3 @@
 module VimPrinter
-  VERSION = "0.1.9"
+  VERSION = "0.1.10"
 end

data/vim_printer.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = Dir.glob("{test}/**/*")
   spec.require_paths = ["lib"]
   spec.add_runtime_dependency "thor", "~> 0.19"
-  spec.add_runtime_dependency "code_lister", "~> 0.1"
+  spec.add_runtime_dependency "code_lister", "~> 0.1.3"
   spec.add_runtime_dependency "index_html", "~> 0.1"
   spec.add_runtime_dependency "agile_utils", "~> 0.1"
   spec.add_development_dependency "bundler", "~> 1.3"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vim_printer
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - Burin Choomnuan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-13 00:00:00.000000000 Z
+date: 2014-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.1.3
 - !ruby/object:Gem::Dependency
   name: index_html
   requirement: !ruby/object:Gem::Requirement