bbs_uploader 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a6493e66e376c7fc95de0b042ad07fed9513589
-  data.tar.gz: cba63d2d2124b7523c985cff4135014e389b7f25
+  metadata.gz: 4327524fff1ee26bc9582eee8f31a82bf1a07d29
+  data.tar.gz: 3a9639f3f2b7ffdd8e98ed479baaa148160fc4cd
 SHA512:
-  metadata.gz: 71c1a42c39aad4e4a362fb5a2589be96ea6dd3f78e1afc4e0562facc8f62d7f522428947b4c46550974c4b77472a4f471be8ec3242ca9568a28224cd96047b8a
-  data.tar.gz: 23687eb9066ef25c007edf1c39b458d3522ac55f8cc9466b68af871d0549cdabc3fbd1e11fa5c67c56a882c761686ed1f5ca109a563ddc7ccd9f39b7e5f48930
+  metadata.gz: 8e4f2351bf56b9052a59ffdf692bf6a05fd223191e7c416f20be6e01be707b03be5e29b70b6dc9183e5609fc87c87fe00f9df7b960403bf9d285b4e9049181bc
+  data.tar.gz: 374357354892a1480c96d9919917d39076a6050fc227d8617c421f8d2e0d7f3a779e84a9c2363521be590d751cff13e7853f19e0ae536cc33cfb11d9c5fc44be

data/README.md

@@ -54,9 +54,13 @@ markdown 链接: ![](http://ognvcf5x6.bkt.clouddn.com/bbs_image/dongxiang.png)
 
 ![](http://ognvcf5x6.bkt.clouddn.com/bbs_image/test.jpg)
 
+
+![](http://ognvcf5x6.bkt.clouddn.com/bbs_image/dongxiang.png)
+
 **编程使用:** 
 
 ```
+# 选项传递的 Hash 值可以是任意形态的，实现中利用 hashie 抹平了差异
 BbsUploader.qiniu = {
   access_key: 'your access key',
   secret_key: 'your secret key',
@@ -70,12 +74,11 @@ BbsUploader.upload 'http://xiajian.github.io/assets/images/dongxiang.png'
 
 BbsUploader.upload_image '~/Downloads/test.jpg'
 BbsUploader.upload_file '~/Downloads/install.php'
-
 ```
 
-然后，就祝你安好！！！
+然后，就祝君安好！！！
 
-> PS: 思考 网盘以及 CDN 在部署的上区别。 CDN 内容分发，网盘就是云存储。 这就不明白，SB！！
+> PS: 思考 网盘以及 CDN 在部署的上区别。 CDN 内容分发，网盘就是云存储。 这就不明白，SB！！ 上传的 js 以及 css 文件，直接下载获取，不如 专业的 cdn 资源的获取的速度快，所以，专业的 CDN 系统还是有特殊的优化处理的。
 
 ## Development
 

data/bbs_uploader.gemspec

@@ -29,6 +29,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 1.9.3'
 
   spec.add_dependency "qiniu"
+  spec.add_dependency "hashie"
 
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"

data/bin/bbs_uploader

@@ -24,17 +24,25 @@ OptionParser.new do |opts|
   opts.on('-i', '--input-file [file]', 'Input file can be URL, image file or other file') do |file|
     options[:input_file] = File.absolute_path file
   end
+  
+  opts.on('-d', '--input-directory [directory]', 'Input directory must be a directory') do |dir|
+    options[:input_directory] = File.absolute_path file
+  end
 end.parse!
 
-if options[:input_file].nil?
+if options[:input_file].nil? || options[:input_directory].nil?
   file = ARGV[0]
 
   if file.nil?
-   puts "没有选择上传的文件"
+   puts "没有选择上传的文件或目录"
    exit
   end
-
-  options[:input_file] = file
+  
+  if File.directory?(File.absolute_path(file))
+    options[:input_directory] = file
+  else
+    options[:input_file] = file
+  end
 end
 
-BbsUploader.upload options[:input_file]
+BbsUploader.command options

data/lib/bbs_uploader/version.rb

@@ -1,3 +1,3 @@
 module BbsUploader
-  VERSION = "0.1.2"
+  VERSION = "0.1.4"
 end

data/lib/bbs_uploader.rb

@@ -1,5 +1,6 @@
 require "qiniu"
 require "open-uri"                # 下载文件
+require 'hashie'
 require "bbs_uploader/version"
 require "bbs_uploader/ruby_regex"
 
@@ -28,12 +29,14 @@ module BbsUploader
     end
 
     def default_options(options = {})
-      {
+      options = Hashie::Mash.new(options)
+      
+      Hashie::Mash.new({
           access_key: "79WvzAxvV-nOEX7m0PERzwR0Lhm-FDHriz2-QdAN",
           secret_key: "4wwnWNU16n9uVK8DHRW6qO61b2gls3aSduHswkvc",
           bucket: "bss-image",
           bucket_domain: "ognvcf5x6.bkt.clouddn.com"
-      }.merge(options)
+      }).merge(options)
     end
 
     # 下载文件 - 依赖本地的 tmp 目录, 需要 `open-uri`
@@ -130,6 +133,8 @@ module BbsUploader
 
         if file_path =~ IMAGE_FILE_REGEXP
           upload_image file_path
+        else
+          upload_file file_path
         end
       elsif File.exist? resource
         file_path = File.absolute_path(resource)
@@ -143,12 +148,27 @@ module BbsUploader
         puts "输入的文件 #{resource} 不存在，请检查后重试"
       end
     end
+    
+    def upload_with_directory(dir = '')
+      dir = `cd #{dir}; pwd`.chomp
+      return unless File.exists?(dir) && File.directory?(dir)
+      
+      puts "上传目录: #{dir}"
+      
+      files = `ls #{dir}`.split("\n").map { |filename| "#{dir}/#{filename}" }
+      
+      file_links = files.map { |file| upload(file) }
+      
+      puts "生成的图片的链接: #{file_links.join('\n')}"
+      
+      file_links
+    end
 
     def markdown_image_link(image_url)
       if image_url && image_url.is_a?(String) && IMAGE_URL_REGEXP.match(image_url)
         "![](#{image_url})"
       else
-        ''
+        image_url
       end
     end
 
@@ -156,18 +176,20 @@ module BbsUploader
     #
     # @note 注意文件需要按照文件目录的自然顺序
     def generate_markdown_format(dir)
-      content = ''
-      files = []
-
-      `ls #{dir}`.split('\n').map { |filename| files << "#{dir}/#{filename}" }
-
-      files.each do |file|
-        content <<  markdown_image_link(upload_image(file)) + "\n"
-      end
-
+      content = upload_with_directory(dir).map { |link| markdown_image_link(link) }.join("\n")
+        
+      puts "上传链接地址: \n"
       puts content
 
       content
     end
+    
+    def command(options = {})
+      if options[:input_file]
+        upload options[:input_file]
+      elsif options[:input_directory]
+        generate_markdown_format options[:input_directory]
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bbs_uploader
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - xiajian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-21 00:00:00.000000000 Z
+date: 2016-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: qiniu
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: hashie
+  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