tocmd 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c3044c33c4167f29d7f84519de72e1cbeebc85d
-  data.tar.gz: 38d60afad5ec3e90392f971f4c69e6aff6d2ed8c
+  metadata.gz: eaa1ed8669a947520418be972e59994a0d345c97
+  data.tar.gz: f76856ff82a21137011c19d3d637938db05bd412
 SHA512:
-  metadata.gz: ccea96c5752a5687c202b17f810f2f2b857ded8c2126f3d8b6c2ff80f5fed46292131fb61552bc8d3c651b3b569d05d6ea8d42e581e1ced5e07e25676e691117
-  data.tar.gz: 408048591420c5904f1109a9249b5fdeadae99aa570fd4e28390fa36cfcb1ebea33a56fcfe571efe688f8355126dd4b82d4bf129dec4bba53e4bb9e9c81d75f8
+  metadata.gz: 8d69e2830297356c702b46e1be4017901ecce113aac37f726bc4b357675d9c36e8ce8a632420e8372b96b73e9227224b639a8c82a5193231cfece7cdb8c298b8
+  data.tar.gz: d91c3ae3d07feb0d5479ca47702719abb32663f920a72578ed615c1d5a28f9048719f8d3b160b50cc48fcf0532f5c5b373cde72fbae0a083de37db2a9f6ca9d4

data/bin/tocmd

@@ -3,21 +3,11 @@
 
 require 'tocmd'  
 require 'pathname'
-# p ARGV
-# puts Mdpreview.hi(ARGV)
-# 
-# puts   __FILE__  
-# puts File.dirname(__FILE__)
-
+require 'optparse'
 
 # File.join(File.dirname(__FILE__), '..', 'lib')
 path = Pathname.new(File.join(File.dirname(__FILE__), '..')).realpath.to_s
 
-# p "开始#{Dir.pwd}"
-# p "path = #{path}"
-
-require 'optparse'
-
 options = {}
 option_parser = OptionParser.new do |opts|
   # 这里是这个命令行工具的帮助信息
@@ -46,40 +36,28 @@ option_parser = OptionParser.new do |opts|
 	rescue  
 	ensure   
 	end 
-		
-	# begin  
-	# 	Dir.mkdir(File.join(src_p ,".toc"), 0700) #=> 0
-	# rescue  
-	# ensure  
-	# 	f = File.new(File.join(vendor_path ,"template.html"), "w+").path
-	# 	FileUtils.cp(f ,File.join(src_p ,".toc"))
-	# end 
-	# 
   
   # Option 作为flag，带argument，用于将argument作为数值解析，比如"name"信息
   #下面的“value”就是用户使用时输入的argument
-  opts.on('-f sourceFileNAME', '--name sourceFileNAME', 'Pass-in source file name') do |value|
-    # options[:fname] = value
-   
-    Tocmd.hi(src_p + '/' + value)
+  opts.on('-f sourceFileNAME', '--file sourceFileNAME', 'Pass-in source file name') do |value|
+    options[:fname] = src_p + '/' + value
   end
 	
-  opts.on('-d dirNAME', '--name sourceFileNAME', 'Pass-in source file name') do |value|
-    # options[:fname] = value
-		p value
-   
-		if value == '.'
-			Tocmd.hi_dir(src_p + '/' )
-		else
-			Tocmd.hi_dir(src_p + '/' + value)
-		end
-    
+  # 目录参数
+  opts.on('-d sourceDirNAME', '--directory sourceDirNAME', 'Pass-in source directory name') do |value|
+		options[:dname] = value == '.' ? (src_p + '/') : (src_p + '/' + value)    
   end
 
-  # Option 作为flag，带一组用逗号分割的arguments，用于将arguments作为数组解析
-  # opts.on('-a A,B', '--array A,B', Array, 'List of arguments') do |value|
-  #    options[:array] = value
-  #  end
+  # 是否需要浏览器打开参数
+  opts.on('', '--no-browser', 'Not open with browser after translate') do |_value|
+  	Tocmd.set_no_browser(true)
+  end
 end.parse!
 
-# puts options.inspect
+if options.has_key?(:fname) && !options[:fname].nil? && options[:fname] != ''
+  Tocmd.hi(options[:fname])
+end
+
+if options.has_key?(:dname) && !options[:dname].nil? && options[:dname] != ''
+  Tocmd.hi_dir(options[:dname])
+end

data/bin/tocmd_conf

@@ -3,21 +3,11 @@
 
 require 'tocmd'  
 require 'pathname'
-# p ARGV
-# puts Mdpreview.hi(ARGV)
-# 
-# puts   __FILE__  
-# puts File.dirname(__FILE__)
-
+require 'optparse'
 
 # File.join(File.dirname(__FILE__), '..', 'lib')
 path = Pathname.new(File.join(File.dirname(__FILE__), '..')).realpath.to_s
 
-# p "开始#{Dir.pwd}"
-# p "path = #{path}"
-
-require 'optparse'
-
 options = {}
 option_parser = OptionParser.new do |opts|
   # 这里是这个命令行工具的帮助信息
@@ -46,40 +36,28 @@ option_parser = OptionParser.new do |opts|
 	rescue  
 	ensure   
 	end 
-		
-	# begin  
-	# 	Dir.mkdir(File.join(src_p ,".toc"), 0700) #=> 0
-	# rescue  
-	# ensure  
-	# 	f = File.new(File.join(vendor_path ,"template.html"), "w+").path
-	# 	FileUtils.cp(f ,File.join(src_p ,".toc"))
-	# end 
-	# 
   
   # Option 作为flag，带argument，用于将argument作为数值解析，比如"name"信息
   #下面的“value”就是用户使用时输入的argument
   opts.on('-f sourceFileNAME', '--name sourceFileNAME', 'Pass-in source file name') do |value|
-    # options[:fname] = value
-   
-    Tocmd.hi_local(src_p + '/' + value)
+    options[:fname] = src_p + '/' + value
   end
 	
-  opts.on('-d dirNAME', '--name sourceFileNAME', 'Pass-in source file name') do |value|
-    # options[:fname] = value
-		p value
-   
-		if value == '.'
-			Tocmd.hi_dir_local(src_p + '/' )
-		else
-			Tocmd.hi_dir_local(src_p + '/' + value)
-		end
-    
+  # 目录参数
+  opts.on('-d dirNAME', '--name sourceFileNAME', 'Pass-in source file name') do |value|   
+		options[:dname] = value == '.' ? (src_p + '/') : (src_p + '/' + value)
   end
 
-  # Option 作为flag，带一组用逗号分割的arguments，用于将arguments作为数组解析
-  # opts.on('-a A,B', '--array A,B', Array, 'List of arguments') do |value|
-  #    options[:array] = value
-  #  end
+  # 转换完成后，是否需要浏览器打开参数
+  opts.on('', '--no-browser', 'Not open with browser after transform') do |_value|
+  	Tocmd.set_no_browser(true)
+  end
 end.parse!
 
-# puts options.inspect
+if options.has_key?(:fname) && !options[:fname].nil? && options[:fname] != ''
+	Tocmd.hi_conf(options[:fname])
+end
+
+if options.has_key?(:dname) && !options[:dname].nil? && options[:dname] != ''
+	Tocmd.hi_dir_conf(options[:dname])
+end

data/bin/tocmd_local

@@ -3,21 +3,11 @@
 
 require 'tocmd'  
 require 'pathname'
-# p ARGV
-# puts Mdpreview.hi(ARGV)
-# 
-# puts   __FILE__  
-# puts File.dirname(__FILE__)
-
+require 'optparse'
 
 # File.join(File.dirname(__FILE__), '..', 'lib')
 path = Pathname.new(File.join(File.dirname(__FILE__), '..')).realpath.to_s
 
-# p "开始#{Dir.pwd}"
-# p "path = #{path}"
-
-require 'optparse'
-
 options = {}
 option_parser = OptionParser.new do |opts|
   # 这里是这个命令行工具的帮助信息
@@ -46,40 +36,26 @@ option_parser = OptionParser.new do |opts|
 	rescue  
 	ensure   
 	end 
-		
-	# begin  
-	# 	Dir.mkdir(File.join(src_p ,".toc"), 0700) #=> 0
-	# rescue  
-	# ensure  
-	# 	f = File.new(File.join(vendor_path ,"template.html"), "w+").path
-	# 	FileUtils.cp(f ,File.join(src_p ,".toc"))
-	# end 
-	# 
   
   # Option 作为flag，带argument，用于将argument作为数值解析，比如"name"信息
   #下面的“value”就是用户使用时输入的argument
   opts.on('-f sourceFileNAME', '--name sourceFileNAME', 'Pass-in source file name') do |value|
-    # options[:fname] = value
-   
-    Tocmd.hi_local(src_p + '/' + value)
+    options[:fname] = src_p + '/' + value
   end
 	
   opts.on('-d dirNAME', '--name sourceFileNAME', 'Pass-in source file name') do |value|
-    # options[:fname] = value
-		p value
-   
-		if value == '.'
-			Tocmd.hi_dir_local(src_p + '/' )
-		else
-			Tocmd.hi_dir_local(src_p + '/' + value)
-		end
-    
+		options[:dname] = value == '.' ? (src_p + '/') : (src_p + '/' + value)
   end
 
-  # Option 作为flag，带一组用逗号分割的arguments，用于将arguments作为数组解析
-  # opts.on('-a A,B', '--array A,B', Array, 'List of arguments') do |value|
-  #    options[:array] = value
-  #  end
+  opts.on('', '--no-browser', 'Not open with browser after transform') do |_value|
+  	Tocmd.set_no_browser(true)
+  end
 end.parse!
 
-# puts options.inspect
+if options.has_key?(:fname) && !options[:fname].nil? && options[:fname] != ''
+  Tocmd.hi_local(options[:fname])
+end
+
+if options.has_key?(:dname) && !options[:dname].nil? && options[:dname] != ''
+  Tocmd.hi_dir_local(options[:dname])
+end

data/lib/tocmd.rb

@@ -4,17 +4,23 @@ require "tocmd/translator_local"
 require "tocmd/translator_conf"
 
 module Tocmd
+  @no_browser = false
+
+  def self.set_no_browser(flag)
+    @no_browser = flag
+  end
+
   # ---------------- tocmd command -----------------
   def self.hi(a)  
     translator = Translator.new(a)  
-    translator.hi  
+    translator.hi(@no_browser)  
     # puts version info
     p VERSION
   end
 	
   def self.hi_dir(a)  
     translator = Translator.new(a)  
-    translator.hi_dir 
+    translator.hi_dir(@no_browser) 
     # puts version info
     p VERSION
   end
@@ -22,29 +28,29 @@ module Tocmd
   # ---------------- tocmd_local command -----------------
   def self.hi_local(a)  
     translator = TranslatorLocal.new(a)  
-    translator.hi  
+    translator.hi(@no_browser)  
     # puts version info
     p VERSION
   end
 	
   def self.hi_dir_local(a)  
     translator = TranslatorLocal.new(a)  
-    translator.hi_dir 
+    translator.hi_dir(@no_browser) 
     # puts version info
     p VERSION
   end
   
   # ---------------- tocmd_conf command -----------------
-  def self.hi_local(a)  
+  def self.hi_conf(a)  
     translator = TranslatorConf.new(a)  
-    translator.hi  
+    translator.hi(@no_browser)
     # puts version info
     p VERSION
   end
 	
-  def self.hi_dir_local(a)  
+  def self.hi_dir_conf(a)  
     translator = TranslatorConf.new(a)  
-    translator.hi_dir 
+    translator.hi_dir(@no_browser)
     # puts version info
     p VERSION
   end

data/lib/tocmd/translator.rb

@@ -13,7 +13,7 @@ class Tocmd::Translator
     @editor_path =  Pathname.new(File.expand_path('../../../vendor', __FILE__)).realpath.to_s  
   end  
   
-  def hi
+  def hi(no_browser)
       generate_meta_js
       # cp_source_file_to_cur_file
       
@@ -30,14 +30,13 @@ class Tocmd::Translator
 			
 			build_with_dir(@source_file_path ,dest_dir)
 			
-			open_in_browser
+			open_in_browser unless no_browser
   end
 	
-  def hi_dir
+  def hi_dir(no_browser)
       generate_meta_js
       # cp_source_file_to_cur_file
       
-			
 			ar = @source_file_path.split('/')
 			# ar.pop()
 			
@@ -51,7 +50,7 @@ class Tocmd::Translator
 			
 			build_with_dir(src_path ,dest_dir)
 			
-			open_in_browser
+			open_in_browser unless no_browser
   end
   
   def open_in_browser

data/lib/tocmd/translator_conf.rb

@@ -14,7 +14,7 @@ class Tocmd::TranslatorConf
 
   end
   
-  def hi
+  def hi(no_browser)
       generate_meta_js
       # cp_source_file_to_cur_file
       
@@ -37,11 +37,10 @@ class Tocmd::TranslatorConf
       # build now
 			build_with_dir(@source_file_path ,dest_dir)
 			
-      # if mac open in browser
-			open_in_browser
+			open_in_browser unless no_browser
   end
 	
-  def hi_dir
+  def hi_dir(no_browser)
       generate_meta_js
       # cp_source_file_to_cur_file
     
@@ -63,7 +62,7 @@ class Tocmd::TranslatorConf
       
 			build_with_dir(src_path ,dest_dir)
 			
-			open_in_browser
+			open_in_browser unless no_browser
   end
   
   def _toc_config(dest_dir)

data/lib/tocmd/translator_local.rb

@@ -3,7 +3,7 @@ require 'pathname'
 require 'fileutils'
 require 'os'
 
-class Tocmd::TranslatorLocal  
+class Tocmd::TranslatorLocal
   def initialize(source_file_path) 
     #源文件路径
     @source_file_path = source_file_path    
@@ -13,7 +13,7 @@ class Tocmd::TranslatorLocal
     @editor_path =  Pathname.new(File.expand_path('../../../vendor', __FILE__)).realpath.to_s  
   end  
   
-  def hi
+  def hi(no_browser)
       generate_meta_js
       # cp_source_file_to_cur_file
       
@@ -34,11 +34,11 @@ class Tocmd::TranslatorLocal
       # build now
 			build_with_dir(@source_file_path ,dest_dir)
 			
-      # if mac open in browser
-			open_in_browser
+      # open in browser unless specify no browser
+			open_in_browser unless no_browser
   end
 	
-  def hi_dir
+  def hi_dir(no_browser)
       generate_meta_js
       # cp_source_file_to_cur_file
     
@@ -58,7 +58,8 @@ class Tocmd::TranslatorLocal
 			
 			build_with_dir(src_path ,dest_dir)
 			
-			open_in_browser
+			# open in browser unless specify no browser
+			open_in_browser unless no_browser
   end
   
   def open_in_browser

data/lib/tocmd/version.rb

@@ -1,3 +1,3 @@
 module Tocmd
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

metadata

@@ -1,41 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: tocmd
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - shiren1118
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-25 00:00:00.000000000 Z
+date: 2017-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redcarpet
   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: pygments.rb
   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: os
+  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'
 description: convert markdown to html with i5ting_ztree_toc plugin
@@ -48,16 +62,15 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- bin/tocmd
-- bin/tocmd_conf
-- bin/tocmd_local
 - lib/tocmd.rb
 - lib/tocmd/markdown_render.rb
 - lib/tocmd/translator.rb
 - lib/tocmd/translator_conf.rb
 - lib/tocmd/translator_local.rb
 - lib/tocmd/version.rb
-- test/mdptest.rb
+- bin/tocmd
+- bin/tocmd_conf
+- bin/tocmd_local
 - vendor/meta.js
 - vendor/template.html
 - vendor/toc/css/demo.css
@@ -87,6 +100,7 @@ files:
 - vendor/toc/style/github-bf51422f4bb36427d391e4b75a1daa083c2d840e.css
 - vendor/toc/style/github2-d731afd4f624c99a4b19ad69f3083cd6d02b81d5.css
 - vendor/toc/style/makedownpad.css
+- test/mdptest.rb
 homepage: http://ruby-china.org/topics/17028
 licenses: []
 metadata: {}
@@ -96,17 +110,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: convert markdown to html with i5ting_ztree_toc plugin