gemoji 3.0.0.rc2 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2962c3dbfa8c4208c93ba5f64c9f39601c7045a2
-  data.tar.gz: 94b8bc5ab26209fabaf4cc7a9bde753e7aa40478
+  metadata.gz: 129cc87f6beaf861e6f886c5d2db15562225dde5
+  data.tar.gz: 9b310aaf5a6522824af665e8b88c04a023d2b708
 SHA512:
-  metadata.gz: cf4e7bc02484ebd18cebd9140371baa0580d16f70bc866aff6d0d5a666fe1ea10ebaa00632212ec02781203fe90316168376a271dfbbbcb05e95024bb073516f
-  data.tar.gz: dd7f42d8693152b2f876f3a7a4b2fb4635039b35757619d106bd3efbab4abab029dcc1861fbf4919cc3876d3ca0089a22887f1c43a698776d67a0c6c50829382
+  metadata.gz: c011fa25acb8922733993c64811adfac911e5661bf1ea587ea655e9ce28a82bdac5788c61fda8c3977dd2ee7938b462c95f1f839ed2b0a8f647d6692ff5f1bb3
+  data.tar.gz: 49cea6f72f419949b1e5b4b3d8199e48f96d9da92a338ac7d87bc337a0722f62d80da02ae3abe2af8f4a1bb1688c52473fa912e6a0c40accdbf28a9eadd46eca

data/lib/emoji/cli.rb

@@ -1,10 +1,13 @@
 require 'emoji/extractor'
 require 'fileutils'
+require 'optparse'
 
 module Emoji
   module CLI
     extend self
 
+    InvalidUsage = Class.new(RuntimeError)
+
     def dispatch(argv)
       cmd = argv[0]
       argv = argv[1..-1]
@@ -15,11 +18,15 @@ module Emoji
       when "help", "--help", "-h"
         help
       else
-        raise ArgumentError
+        raise InvalidUsage
       end
 
       return 0
-    rescue ArgumentError
+    rescue InvalidUsage, OptionParser::InvalidArgument, OptionParser::InvalidOption => err
+      unless err.message == err.class.to_s
+        $stderr.puts err.message
+        $stderr.puts
+      end
       $stderr.puts usage_text
       return 1
     end
@@ -28,11 +35,25 @@ module Emoji
       puts usage_text
     end
 
+    VALID_SIZES = [ 20, 32, 40, 48, 64, 96, 160 ]
+
     def extract(argv)
-      path = argv.shift
-      raise ArgumentError if path.to_s.empty?
+      size = 64
+
+      OptionParser.new do |opts|
+        opts.on("--size=#{size}", Integer) do |val|
+          if VALID_SIZES.include?(val)
+            size = val
+          else
+            raise InvalidUsage, "size should be one of: #{VALID_SIZES.join(', ')}"
+          end
+        end
+      end.parse!(argv)
+
+      raise InvalidUsage unless argv.size == 1
+      path = argv[0]
 
-      Emoji::Extractor.new(64, path).extract!
+      Emoji::Extractor.new(size, path).extract!
       Dir["#{Emoji.images_path}/*.png"].each do |png|
         FileUtils.cp(png, File.join(path, File.basename(png)))
       end
@@ -40,7 +61,7 @@ module Emoji
 
     def usage_text
       <<EOF
-Usage: gemoji extract <path>
+Usage: gemoji extract <path> [--size=64]
 EOF
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gemoji
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc2
+  version: 3.0.0
 platform: ruby
 authors:
 - GitHub
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-20 00:00:00.000000000 Z
+date: 2016-12-21 00:00:00.000000000 Z
 dependencies: []
 description: Character information and metadata for standard and custom emoji.
 email: support@github.com
@@ -58,9 +58,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5.1