gyazo 3.2.0 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5501aee18aa242031b41934001bef19e73a034545aaebaadf199328eee8518a
-  data.tar.gz: 351c8efbdf423ad30ebd642988a31cb69f6eaa6512e1338f574e46aab8310347
+  metadata.gz: b8672fc0d9fd37e7c71b08e3cadd36472b2fc4a2cad4f41f563aa9f96e4affbb
+  data.tar.gz: abd342aedbbea609a30fb62402b8b211dfdd0da636549994566723ac995ead80
 SHA512:
-  metadata.gz: 7a9e35b78e352e767aa970ed40ef09be8c7e9548b59b931abfcbeec309d8a83a462cdffa809f40d9f61a2c675fcc02aef0d63235eab2700b37397973a04106a8
-  data.tar.gz: 93c352deb35426ca0528cc5ca7b0c67ec23c75945ee6672efc86d7f3d5326ba140cd69da007c7ee254ecb40713142ddb919b08b1ee1eb8ee361aaed7abab6a11
+  metadata.gz: c9c002c93d8416bd0f1577f9b7c6250972d3fc2d825ae2740bf3e3d2fa5b67f1f5e42e2e6afe2d260d24439724df3cdc28d57bd7f8ffef93a61bca12718843d4
+  data.tar.gz: f5d89f9babc8a0e914372507d20b03d4cf3bb512d4751b11a6efbc44ca5ce5aae9175974f8984f478e281f622656dc6c972bab752ea4271aaba2eddc05826c9b

data/.gitignore

@@ -4,3 +4,4 @@
 pkg
 tmp
 .ruby-version
+bin/

data/Gemfile

@@ -2,3 +2,5 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in event_emitter.gemspec
 gemspec
+
+gem 'mutex_m'

data/exe/gyazo

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+$LOAD_PATH.unshift File.join(__dir__, '..', 'lib')
+require 'gyazo/cli'
+Gyazo::CLI.start(ARGV)

data/gyazo.gemspec

@@ -14,7 +14,8 @@ Gem::Specification.new do |spec|
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/).reject{|i| i=="Gemfile.lock" }
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.bindir        = 'exe'
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 

data/lib/gyazo/cli.rb

@@ -0,0 +1,237 @@
+# coding: utf-8
+require 'optparse'
+require 'json'
+require 'time'
+require 'fileutils'
+require 'gyazo'
+
+module Gyazo
+  class CLI
+    CONFIG_FILE = File.join(Dir.home, '.config', 'gyazo', 'config')
+
+    def self.start(argv)
+      new.run(argv)
+    end
+
+    def run(argv)
+      global_options = {}
+      global_parser = OptionParser.new do |opts|
+        opts.banner = <<~BANNER
+          Usage: gyazo [options] <command> [args]
+
+          Commands:
+            auth login                    Save access token to config file
+            auth logout                   Remove access token from config file
+
+            upload <file>                 Upload an image
+              --title TITLE               Image title
+              --description DESC          Image description
+              --collection-id ID          Collection ID
+              --created-at DATETIME       Created at (ISO 8601)
+
+            list                          List images
+              --page N                    Page number (default: 1)
+              --per-page N                Per page (default: 20)
+
+            image <id>                    Show image details
+            delete <id>                   Delete an image
+
+            search <query>                Search images
+              --page N                    Page number (default: 1)
+              --per-page N                Per page (default: 20)
+
+            user                          Show user info
+            version                       Show version
+
+          Options:
+        BANNER
+        opts.on('-t', '--token TOKEN', 'Access token') { |t| global_options[:token] = t }
+        opts.on('-f', '--format FORMAT', 'Output format: text (default) or json') { |f| global_options[:format] = f }
+        opts.on_tail('-h', '--help', 'Show help') { puts opts; exit }
+        opts.on_tail('-v', '--version', 'Show version') { puts Gyazo::VERSION; exit }
+      end
+
+      global_parser.order!(argv)
+      command = argv.shift
+
+      case command
+      when 'auth'    then run_auth(argv, global_options)
+      when 'upload'  then run_upload(argv, global_options)
+      when 'list'    then run_list(argv, global_options)
+      when 'image'   then run_image(argv, global_options)
+      when 'delete'  then run_delete(argv, global_options)
+      when 'search'  then run_search(argv, global_options)
+      when 'user'    then run_user(argv, global_options)
+      when 'version' then puts Gyazo::VERSION
+      when nil
+        warn global_parser
+        exit 1
+      else
+        warn "Unknown command: #{command}\n\n#{global_parser}"
+        exit 1
+      end
+    rescue Gyazo::Error => e
+      warn "Error: #{e.message}"
+      exit 1
+    end
+
+    private
+
+    def client(options)
+      token = resolve_token(options)
+      abort "No access token. Set GYAZO_ACCESS_TOKEN or run 'gyazo auth login'" unless token
+      Gyazo::Client.new(access_token: token)
+    end
+
+    def resolve_token(options)
+      options[:token] || ENV['GYAZO_ACCESS_TOKEN'] || load_token
+    end
+
+    def load_token
+      return nil unless File.exist?(CONFIG_FILE)
+      File.foreach(CONFIG_FILE) do |line|
+        return $1.strip if line =~ /\Aaccess_token=(.+)/
+      end
+      nil
+    end
+
+    def save_token(token)
+      FileUtils.mkdir_p(File.dirname(CONFIG_FILE))
+      File.write(CONFIG_FILE, "access_token=#{token}\n")
+      File.chmod(0o600, CONFIG_FILE)
+    end
+
+    def run_auth(argv, _options)
+      subcommand = argv.shift
+      case subcommand
+      when 'login'
+        puts 'Create a token at https://gyazo.com/oauth/applications'
+        print 'Enter your Gyazo access token: '
+        token = $stdin.gets&.chomp
+        abort 'Cancelled' if token.nil? || token.empty?
+        save_token(token)
+        puts "Token saved to #{CONFIG_FILE}"
+      when 'logout'
+        if File.exist?(CONFIG_FILE)
+          File.delete(CONFIG_FILE)
+          puts 'Token removed'
+        else
+          puts 'No token found'
+        end
+      else
+        warn 'Usage: gyazo auth <login|logout>'
+        exit 1
+      end
+    end
+
+    def run_upload(argv, options)
+      upload_opts = {}
+      parser = OptionParser.new do |opts|
+        opts.banner = 'Usage: gyazo upload [options] <file>'
+        opts.on('--title TITLE', 'Image title') { |v| upload_opts[:title] = v }
+        opts.on('--description DESC', 'Image description') { |v| upload_opts[:desc] = v }
+        opts.on('--collection-id ID', 'Collection ID') { |v| upload_opts[:collection_id] = v }
+        opts.on('--created-at DATETIME', 'Created at (ISO 8601)') { |v| upload_opts[:created_at] = Time.parse(v) }
+      end
+      parser.parse!(argv)
+
+      file = argv.shift
+      abort parser.to_s unless file
+      abort "File not found: #{file}" unless File.file?(file)
+
+      result = client(options).upload(imagefile: file, **upload_opts)
+      output(result, options)
+    end
+
+    def run_list(argv, options)
+      list_opts = {}
+      parser = OptionParser.new do |opts|
+        opts.banner = 'Usage: gyazo list [options]'
+        opts.on('--page N', Integer, 'Page number (default: 1)') { |v| list_opts[:page] = v }
+        opts.on('--per-page N', Integer, 'Per page (default: 20)') { |v| list_opts[:per_page] = v }
+      end
+      parser.parse!(argv)
+
+      result = client(options).list(**list_opts)
+
+      if options[:format] == 'json'
+        puts JSON.pretty_generate(result)
+      else
+        puts "Total: #{result[:total_count]}  Page: #{result[:current_page]}  Per page: #{result[:per_page]}"
+        puts
+        result[:images].each do |img|
+          puts "#{img[:image_id]}  #{img[:permalink_url]}"
+          title = img.dig(:metadata, :title)
+          puts "  #{title}" unless title.nil? || title.empty?
+          puts "  #{img[:created_at]}" if img[:created_at]
+        end
+      end
+    end
+
+    def run_image(argv, options)
+      id = argv.shift
+      abort 'Usage: gyazo image <id>' unless id
+      output(client(options).image(image_id: id), options)
+    end
+
+    def run_delete(argv, options)
+      id = argv.shift
+      abort 'Usage: gyazo delete <id>' unless id
+      result = client(options).delete(image_id: id)
+      if options[:format] == 'json'
+        puts JSON.pretty_generate(result)
+      else
+        puts "Deleted: #{result[:image_id]}"
+      end
+    end
+
+    def run_search(argv, options)
+      search_opts = {}
+      parser = OptionParser.new do |opts|
+        opts.banner = 'Usage: gyazo search [options] <query>'
+        opts.on('--page N', Integer, 'Page number (default: 1)') { |v| search_opts[:page] = v }
+        opts.on('--per-page N', Integer, 'Per page (default: 20)') { |v| search_opts[:per_page] = v }
+      end
+      parser.parse!(argv)
+
+      query = argv.shift
+      abort parser.to_s unless query
+
+      result = client(options).search(query:, **search_opts)
+      if options[:format] == 'json'
+        puts JSON.pretty_generate(result)
+      else
+        result.each do |img|
+          puts "#{img[:image_id]}  #{img[:permalink_url]}"
+          title = img.dig(:metadata, :title)
+          puts "  #{title}" unless title.nil? || title.empty?
+        end
+      end
+    end
+
+    def run_user(argv, options)
+      output(client(options).user_info, options)
+    end
+
+    def output(data, options)
+      if options[:format] == 'json'
+        puts JSON.pretty_generate(data)
+      else
+        print_hash(data)
+      end
+    end
+
+    def print_hash(hash, indent = 0)
+      hash.each do |k, v|
+        if v.is_a?(Hash)
+          puts "#{' ' * indent}#{k}:"
+          print_hash(v, indent + 2)
+        elsif v.is_a?(Array)
+          puts "#{' ' * indent}#{k}: [#{v.length} items]"
+        else
+          puts "#{' ' * indent}#{k}: #{v.to_s.gsub(/\r?\n/, '\n')}"
+        end
+      end
+    end
+  end
+end

data/lib/gyazo/client.rb

@@ -39,47 +39,36 @@ module Gyazo
         }
         req.headers['User-Agent'] = @user_agent
       end
-      raise Gyazo::Error, res.body unless res.status == 200
-      return ::JSON.parse res.body, symbolize_names: true
+
+      parse_body(res)[:json]
     end
 
     def list(page: 1, per_page: 20)
-      path = '/api/images'
-      res = @conn.get path do |req|
-        req.params[:access_token] = @access_token
-        req.params[:page] = page
-        req.params[:per_page] = per_page
-        req.headers['User-Agent'] = @user_agent
-      end
-      raise Gyazo::Error, res.body unless res.status == 200
-      json = ::JSON.parse res.body, symbolize_names: true
+      r = send_get(path: '/api/images', params: { page:, per_page: })
+      res = r[:response]
       {
         total_count: res.headers['X-Total-Count'],
         current_page: res.headers['X-Current-Page'],
         per_page: res.headers['X-Per-Page'],
         user_type: res.headers['X-User-Type'],
-        images: json
+        images: r[:json],
       }
     end
 
     def image(image_id:)
-      path = "/api/images/#{image_id}"
-      send_get_without_param(path:)
+      send_get(path: "/api/images/#{image_id}")[:json]
     end
 
     def delete(image_id:)
-      path = "/api/images/#{image_id}"
-      res = @conn.delete path do |req|
-        req.params[:access_token] = @access_token
-        req.headers['User-Agent'] = @user_agent
-      end
-      raise Gyazo::Error, res.body unless res.status == 200
-      return ::JSON.parse res.body, symbolize_names: true
+      send_delete(path: "/api/images/#{image_id}")[:json]
     end
 
     def user_info
-      path = '/api/users/me'
-      send_get_without_param(path:)
+      send_get(path: '/api/users/me')[:json]
+    end
+
+    def search(query:, page: 1, per_page: 20)
+      send_get(path: '/api/search', params: { query:, page:, per_page: })[:json]
     end
 
     private
@@ -95,13 +84,35 @@ module Gyazo
       raise ArgumentError, "cannot find file #{file}"
     end
 
-    def send_get_without_param(path:)
-      res = @conn.get path do |req|
+    def send_req(method:, path:, params: {})
+      res = @conn.send(method) do |req|
+        req.url path
         req.params[:access_token] = @access_token
+        params.each do |k, v|
+          req.params[k] = v
+        end
         req.headers['User-Agent'] = @user_agent
       end
+
+      parse_body(res)
+    end
+
+    def send_get(path:, params: {})
+      send_req(method: :get, path:, params:)
+    end
+
+    def send_delete(path:, params: {})
+      send_req(method: :delete, path:, params:)
+    end
+
+    def parse_body(res)
       raise Gyazo::Error, res.body unless res.status == 200
-      return ::JSON.parse res.body, symbolize_names: true
+      begin
+        json = ::JSON.parse res.body, symbolize_names: true
+      rescue ::JSON::ParserError => e
+        raise Gyazo::Error, "Gyazo API response is not JSON: #{e.message}, body: #{res.body}"
+      end
+      { json:, response: res }
     end
   end
 end

data/lib/gyazo/version.rb

@@ -1,3 +1,3 @@
 module Gyazo
-  VERSION = '3.2.0'
+  VERSION = '3.3.0'
 end

data/test/test_cli.rb

@@ -0,0 +1,169 @@
+require File.expand_path 'test_helper', File.dirname(__FILE__)
+require 'gyazo/cli'
+require 'tmpdir'
+
+class TestCLI < MiniTest::Test
+  def setup
+    @cli = Gyazo::CLI.new
+    @tmpdir = Dir.mktmpdir
+    @config_file = File.join(@tmpdir, 'config')
+    # Override CONFIG_FILE constant for tests
+    Gyazo::CLI.send(:remove_const, :CONFIG_FILE) if Gyazo::CLI.const_defined?(:CONFIG_FILE)
+    Gyazo::CLI.const_set(:CONFIG_FILE, @config_file)
+  end
+
+  def teardown
+    FileUtils.rm_rf(@tmpdir)
+    # Restore original
+    Gyazo::CLI.send(:remove_const, :CONFIG_FILE) if Gyazo::CLI.const_defined?(:CONFIG_FILE)
+    Gyazo::CLI.const_set(:CONFIG_FILE, File.join(Dir.home, '.config', 'gyazo', 'config'))
+  end
+
+  # --- Token resolution ---
+
+  def test_load_token_returns_nil_when_no_config
+    assert_nil @cli.send(:load_token)
+  end
+
+  def test_save_and_load_token
+    @cli.send(:save_token, 'mytoken123')
+    assert_equal 'mytoken123', @cli.send(:load_token)
+  end
+
+  def test_save_token_sets_permissions
+    @cli.send(:save_token, 'mytoken123')
+    mode = File.stat(@config_file).mode & 0o777
+    assert_equal 0o600, mode
+  end
+
+  def test_resolve_token_prefers_option_flag
+    @cli.send(:save_token, 'fromfile')
+    ENV['GYAZO_ACCESS_TOKEN'] = 'fromenv'
+    token = @cli.send(:resolve_token, { token: 'fromflag' })
+    assert_equal 'fromflag', token
+  ensure
+    ENV.delete('GYAZO_ACCESS_TOKEN')
+  end
+
+  def test_resolve_token_prefers_env_over_file
+    @cli.send(:save_token, 'fromfile')
+    ENV['GYAZO_ACCESS_TOKEN'] = 'fromenv'
+    token = @cli.send(:resolve_token, {})
+    assert_equal 'fromenv', token
+  ensure
+    ENV.delete('GYAZO_ACCESS_TOKEN')
+  end
+
+  def test_resolve_token_falls_back_to_file
+    ENV.delete('GYAZO_ACCESS_TOKEN')
+    @cli.send(:save_token, 'fromfile')
+    token = @cli.send(:resolve_token, {})
+    assert_equal 'fromfile', token
+  end
+
+  def test_resolve_token_returns_nil_when_nothing
+    ENV.delete('GYAZO_ACCESS_TOKEN')
+    assert_nil @cli.send(:resolve_token, {})
+  end
+
+  # --- Output formatting ---
+
+  def test_output_text_format
+    data = { image_id: 'abc123', permalink_url: 'https://gyazo.com/abc123' }
+    out = capture_stdout { @cli.send(:output, data, {}) }
+    assert_includes out, 'image_id: abc123'
+    assert_includes out, 'permalink_url: https://gyazo.com/abc123'
+  end
+
+  def test_output_json_format
+    data = { image_id: 'abc123', permalink_url: 'https://gyazo.com/abc123' }
+    out = capture_stdout { @cli.send(:output, data, { format: 'json' }) }
+    parsed = JSON.parse(out, symbolize_names: true)
+    assert_equal 'abc123', parsed[:image_id]
+  end
+
+  def test_output_nested_hash
+    data = { metadata: { title: 'My Image', desc: 'A test' } }
+    out = capture_stdout { @cli.send(:output, data, {}) }
+    assert_includes out, 'metadata:'
+    assert_includes out, 'title: My Image'
+  end
+
+  def test_output_escapes_newlines_in_values
+    data = { desc: "line1\nline2\r\nline3" }
+    out = capture_stdout { @cli.send(:output, data, {}) }
+    # 値の中の改行がエスケープされ、出力が1行になること
+    assert_equal 1, out.lines.length
+    assert_includes out, 'desc: line1\nline2\nline3'
+  end
+
+  def test_output_array_shows_count
+    data = { images: [1, 2, 3] }
+    out = capture_stdout { @cli.send(:output, data, {}) }
+    assert_includes out, 'images: [3 items]'
+  end
+
+  # --- version command ---
+
+  def test_version_command
+    out = capture_stdout { @cli.run(['version']) }
+    assert_equal Gyazo::VERSION, out.chomp
+  end
+
+  # --- upload validation ---
+
+  def test_upload_aborts_without_file_argument
+    err = assert_raises(SystemExit) do
+      capture_stderr { @cli.run(['--token', 'dummy', 'upload']) }
+    end
+    assert_equal 1, err.status
+  end
+
+  def test_upload_aborts_with_nonexistent_file
+    err = assert_raises(SystemExit) do
+      capture_stderr { @cli.run(['--token', 'dummy', 'upload', '/nonexistent/file.png']) }
+    end
+    assert_equal 1, err.status
+  end
+
+  # --- auth commands ---
+
+  def test_auth_logout_when_no_token
+    out = capture_stdout { @cli.run(['auth', 'logout']) }
+    assert_includes out, 'No token found'
+  end
+
+  def test_auth_logout_removes_config
+    @cli.send(:save_token, 'mytoken')
+    assert File.exist?(@config_file)
+    capture_stdout { @cli.run(['auth', 'logout']) }
+    refute File.exist?(@config_file)
+  end
+
+  def test_auth_unknown_subcommand
+    err = assert_raises(SystemExit) do
+      capture_stderr { @cli.run(['auth', 'unknown']) }
+    end
+    assert_equal 1, err.status
+  end
+
+  private
+
+  def capture_stdout
+    old = $stdout
+    $stdout = StringIO.new
+    yield
+    $stdout.string
+  ensure
+    $stdout = old
+  end
+
+  def capture_stderr
+    old = $stderr
+    $stderr = StringIO.new
+    yield
+    $stderr.string
+  ensure
+    $stderr = old
+  end
+end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: gyazo
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.0
 platform: ruby
 authors:
 - Toshiyuki Masui
 - Sho Hashimoto
 - Nana Kugayama
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2025-01-05 00:00:00.000000000 Z
+date: 2026-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -98,7 +98,8 @@ dependencies:
 description: Gyazo.com API Wrapper
 email:
 - masui@pitecan.com
-executables: []
+executables:
+- gyazo
 extensions: []
 extra_rdoc_files: []
 files:
@@ -109,14 +110,17 @@ files:
 - Makefile
 - README.md
 - Rakefile
+- exe/gyazo
 - gyazo.gemspec
 - lib/gyazo.rb
+- lib/gyazo/cli.rb
 - lib/gyazo/client.rb
 - lib/gyazo/error.rb
 - lib/gyazo/version.rb
 - samples/list.rb
 - samples/upload.rb
 - test/test.png
+- test/test_cli.rb
 - test/test_gyazo.rb
 - test/test_helper.rb
 homepage: http://github.com/gyazo/gyazo-ruby
@@ -142,5 +146,6 @@ specification_version: 4
 summary: Gyazo.com API Wrapper
 test_files:
 - test/test.png
+- test/test_cli.rb
 - test/test_gyazo.rb
 - test/test_helper.rb