komic-cli 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fbdc149c735015311df034e0f1c60605de5248aa
-  data.tar.gz: 1d81e3e6f749dde7578d49c881e4bd40e8c114d8
+  metadata.gz: c1b54ef1bf644810e847909c33d2b347b9e4ccdf
+  data.tar.gz: 396f898e32192110cfeffa1948570d5497fd65b8
 SHA512:
-  metadata.gz: 51ff0497fd3f1f643094e50ab0fb2298cfdc7c64bd5d20fd991c0e863e51b58662f6ad2eecfd1a1156298fcc99efe319c46c8348b8669344b5e710dfdd015389
-  data.tar.gz: 6b10b60da03d9e1da1d58b09c6abcb3dd248d8af724c3851e7fb2193252a3cc0eaaea824441242bf1a4241394a1f547f46164b6f3445e1026cca39b41d44f174
+  metadata.gz: 8353a7b28ebc04d5d1cce7115cd42a7bc55d2ed9a7cd89c456bbcfafac842c4d6ddde2f51aef9393528a5b0bff7f0116a17e805dce715510ae96fd997347706b
+  data.tar.gz: a1af1a739be51e7d5d8bfe1b52a0677bac81da430a2b0ad4097172a4a4f37c177bce2fc534e71f5f3f8253ff42b8e6d9c3069e463c3ebbc0e23ada46324440d7

data/README.md

@@ -0,0 +1,34 @@
+## Requirements
+
+### 需要安装带有 rsvg 的 imagemagick 用来处理 SVG
+
+MAC OS 下
+```bash
+  brew install imagemagick --with-librsvg
+```
+
+## Install
+
+```bash
+  $ gem install komic-cli
+```
+
+## Usage
+
+```
+  Commands:
+    komic download URL    # 从 url 下载画册数据 (* 目前只支持豆瓣相册)
+    komic mock            # 生成虚拟的画册数据
+    komic help [COMMAND]  # Describe available commands or one specific command
+
+  Usage:
+    komic mock
+
+    Options:
+    [--page-number=PAGE-NUMBER]   # 设定页数
+                                  # Default: 6
+    [--size=SIZE]                 # 设定尺寸
+                                  # Default: 700-1024x900-1000
+    [--name=NAME]                 # 设定文件夹名
+                                  # Default: mock
+```

data/komic-cli.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'mini_magick', '~> 4.2'
   gem.add_runtime_dependency 'jbuilder', '~> 2.3'
   gem.add_runtime_dependency 'json-schema', '~> 2.5'
+  gem.add_runtime_dependency 'ruby-progressbar', '~> 1.7'
 
   gem.add_development_dependency 'bundler', '~> 1.0'
   gem.add_development_dependency 'rake', '~> 0.8'

data/lib/komic/cli.rb

@@ -22,6 +22,12 @@ module Komic
       generator.create_package({ images: images, meta: { name: title } }, options)
     end
 
+    desc "version", "显示版本"
+    def version
+      say "Komic #{Komic::VERSION}"
+      say "Komic's content.json version #{Komic::CONTENT_JSON_VERSION}"
+    end
+
     desc "mock", "生成虚拟的画册数据"
     option :'page-number', default: 6, desc: "设定页数"
     option :size, default: "700-1024x900-1000", desc: "设定尺寸"

data/lib/komic/crawler/douban.rb

@@ -2,6 +2,7 @@ require 'mechanize'
 require 'fileutils'
 require 'mime/types'
 require 'tmpdir'
+require 'ruby-progressbar'
 
 module Komic
   module Crawler
@@ -10,6 +11,7 @@ module Komic
         @mechanize = Mechanize.new
         @file_index = 0
         @tmpdir = Dir.mktmpdir
+        @willbe_downloaded = []
       end
 
       def get_crawled_result(album_home_url)
@@ -36,8 +38,22 @@ module Komic
           next_link_url = next_link["href"]
         end
 
-        image_pathes = (Dir.entries(@tmpdir) - %w[. ..]).map do |path|
-          File.join(@tmpdir, path)
+        # green background
+        color_code = "\e[0m\e[32m\e[7m\e[1m"
+        reset_code = "\e[0m"
+        progress_status = "#{color_code} %p%% #{reset_code}"
+
+        bar = ProgressBar.create( :format         => "%a %bᗧ%i #{progress_status} %t",
+                                  :title          => 'Download image from douban',
+                                  :progress_mark  => ' ',
+                                  :remainder_mark => '･',
+                                  :total => @willbe_downloaded.size,
+                                  :starting_at    => 0 )
+
+        image_pathes = @willbe_downloaded.map do |url|
+          image_path = download_image url
+          bar.increment
+          image_path
         end
 
         return album_title, image_pathes
@@ -62,10 +78,10 @@ module Komic
 
         unless link_to_large.nil?
           @mechanize.get(link_to_large['href']) do |page|
-            download_image(page.at('#pic-viewer img')["src"])
+            @willbe_downloaded.push(page.at('#pic-viewer img')["src"])
           end
         else
-          download_image(thumb_photo_url)
+          @willbe_downloaded.push(thumb_photo_url)
         end
       end
 
@@ -73,11 +89,12 @@ module Komic
         resource = @mechanize.get(photo_url)
         content_type = resource["content-type"]
         mime_type = MIME::Types[resource["content-type"]].first
-        resource.save(File.expand_path( \
-          [@file_index, mime_type.extensions.first].join('.'), @tmpdir))
+        image_path = File.expand_path( \
+          [@file_index, mime_type.extensions.first].join('.'), @tmpdir)
+        resource.save(image_path)
         @file_index = @file_index + 1
-        p 'current image is ' + @file_index.to_s
         sleep 2
+        image_path
       end
     end
   end

data/lib/komic/generator/generator.rb

@@ -7,7 +7,7 @@ require 'mini_magick'
 require 'base64'
 
 require 'komic/version'
-require 'komic/generator/helpers'
+require 'komic/utils'
 
 module Komic
   class ThumbnailsBuilder
@@ -101,7 +101,7 @@ module Komic
     end
 
     def create_fake_image(filename, size)
-      size = Helpers.parse_size(size)
+      size = Utils.parse_size(size)
       file = Tempfile.new([filename, '.svg'])
       image_width = size[:width]
       image_height = size[:height]
@@ -141,7 +141,7 @@ module Komic
       end
 
       files.map do |image, index|
-        image[:src] = Helpers.get_relativepath_as(image[:src], root_dir)
+        image[:src] = Utils.get_relative_path(image[:src], root_dir)
         image
       end
 
@@ -151,12 +151,13 @@ module Komic
         author: { name: 'TEST' },
         thumbnails: {
           height: 200,
-          path: Helpers.get_relativepath_as(thumbnail_path, root_dir),
+          path: Utils.get_relative_path(thumbnail_path, root_dir),
         },
       }
 
-      # TODO(yangqing): require deep_merge, dirty but work
-      meta.merge!(data[:meta]) unless data[:meta].nil?
+      unless data[:meta].nil?
+        meta = Utils.deep_merge_hashes(meta, data[:meta])
+      end
 
       content_builder = ContentBuilder.new(meta, files)
       File.open(File.join(root_dir, './content.json'), 'w') do |file|

data/lib/komic/utils.rb

@@ -0,0 +1,49 @@
+module Komic
+  module Utils extend self
+    # Merges a master hash with another hash, recursively.
+    #
+    # master_hash - the "parent" hash whose values will be overridden
+    # other_hash  - the other hash whose values will be persisted after the merge
+    #
+    # This code was lovingly stolen from some random gem:
+    # http://gemjack.com/gems/tartan-0.1.1/classes/Hash.html
+    #
+    # Thanks to whoever made it.
+    def deep_merge_hashes(master_hash, other_hash)
+      target = master_hash.dup
+
+      other_hash.each_key do |key|
+        if other_hash[key].is_a? Hash and target[key].is_a? Hash
+          target[key] = Utils.deep_merge_hashes(target[key], other_hash[key])
+          next
+        end
+
+        target[key] = other_hash[key]
+      end
+
+      target
+    end
+
+    def parse_size(size)
+      width_range, height_range = size.split('x')
+      width, height = [width_range, height_range].map do |range|
+        unless range.nil?
+          min, max = range.split('-')
+          r = range.to_i
+          unless max.nil?
+            r = Random.rand(min.to_i...max.to_i)
+          end
+          r
+        end
+      end
+      return { width: width, height: height }
+    end
+
+    def get_relative_path(path, root)
+      File.join('./',
+        Pathname.new(path).relative_path_from(
+          Pathname.new(root)
+        ))
+    end
+  end
+end

data/lib/komic/version.rb

@@ -1,4 +1,4 @@
 module Komic
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
   CONTENT_JSON_VERSION = '0.1.0'
 end

data/spec/spec_helper.rb

@@ -1,4 +1,4 @@
 require 'rspec'
-require 'komic/cli/version'
+require 'komic/version'
 
-include Komic::Cli
+include Komic

data/spec/utils_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+require 'komic/utils'
+
+describe Komic::Utils do
+  it "get relative path" do
+    relative_path = subject.get_relative_path("/user/x/abc", "/user/x")
+    expect(relative_path).to be_eql("./abc")
+  end
+
+  before { allow(Random).to receive(:rand).and_return(700) }
+  it "parse `komic mock`'s size opt" do
+    expect(subject.parse_size("700-800x900")).to be_eql({ width: 700, height: 900 })
+    expect(subject.parse_size("800x700-900")).to be_eql({ width: 800, height: 700 })
+    expect(subject.parse_size("800x900")).to be_eql({ width: 800, height: 900 })
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: komic-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - hxgdzyuyi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-03 00:00:00.000000000 Z
+date: 2015-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.5'
+- !ruby/object:Gem::Dependency
+  name: ruby-progressbar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -177,7 +191,7 @@ files:
 - ChangeLog.rdoc
 - Gemfile
 - LICENSE.txt
-- README.rdoc
+- README.md
 - Rakefile
 - bin/komic
 - komic-cli.gemspec
@@ -186,10 +200,10 @@ files:
 - lib/komic/crawler/douban.rb
 - lib/komic/generator/content.schema.json
 - lib/komic/generator/generator.rb
-- lib/komic/generator/helpers.rb
+- lib/komic/utils.rb
 - lib/komic/version.rb
-- spec/cli_spec.rb
 - spec/spec_helper.rb
+- spec/utils_spec.rb
 homepage: https://rubygems.org/gems/komic-cli
 licenses:
 - MIT
@@ -215,5 +229,5 @@ signing_key:
 specification_version: 4
 summary: komic-cli
 test_files:
-- spec/cli_spec.rb
 - spec/spec_helper.rb
+- spec/utils_spec.rb

data/README.rdoc

@@ -1,27 +0,0 @@
-= komic-cli
-
-* {Homepage}[https://rubygems.org/gems/komic-cli]
-* {Documentation}[http://rubydoc.info/gems/komic-cli/frames]
-* {Email}[mailto:hxgdzyuyi at gmail.com]
-
-== Description
-
-TODO: Description
-
-== Features
-
-== Examples
-
-  require 'komic/cli'
-
-== Requirements
-
-== Install
-
-  $ gem install komic-cli
-
-== Copyright
-
-Copyright (c) 2015 hxgdzyuyi
-
-See LICENSE.txt for details.

data/lib/komic/generator/helpers.rb

@@ -1,29 +0,0 @@
-require 'pathname'
-
-module Komic
-  class Generator
-    module Helpers
-      def self.parse_size(size)
-        width_range, height_range = size.split('x')
-        width, height = [width_range, height_range].map do |range|
-          unless range.nil?
-            min, max = range.split('-')
-            r = range.to_i
-            unless max.nil?
-              r = Random.rand(min.to_i...max.to_i)
-            end
-            r
-          end
-        end
-        return { width: width, height: height }
-      end
-
-      def self.get_relativepath_as(path, root)
-        File.join('./',
-          Pathname.new(path).relative_path_from(
-            Pathname.new(root)
-          ))
-      end
-    end
-  end
-end

data/spec/cli_spec.rb

@@ -1,8 +0,0 @@
-require 'spec_helper'
-require 'komic/cli'
-
-describe Komic::Cli do
-  it "should have a VERSION constant" do
-    subject.const_get('VERSION').should_not be_empty
-  end
-end