hypertodo 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d493db5edd1eb7c2dc2efa67480573562f5b38ff
-  data.tar.gz: 21d1db2e8b4dd6e85df21b5723bd7255cee66c1b
+  metadata.gz: 7943f78b505274eb89f357b34380b166e4f6b2a0
+  data.tar.gz: 01b1213c8b66b36394310437899fb44e023fa52b
 SHA512:
-  metadata.gz: 506540e9e931e4bda3be1310997cd4361a9c278d0c4134c5249bae3a6509eacddec080aae71a834a55119de43b204f795d488d1f0cc51096279dce85fab43c35
-  data.tar.gz: 9aedb778d30904090d7ea8ed360753b1b4ab59bd9d4d2653f2352e8a3bd59ce005c7bf0e82f4c94550d6faeff39a8adc6b0f73b848a48f2ba2c5479f22f777a1
+  metadata.gz: 5c6b8b11a87cb0cfbe19f02c83122e218fd13f395701e39fe4a1634121ed34bcc486053c98ec030bb25ed902caafa2542b81360932a62c8d3ac45cde327d1a2d
+  data.tar.gz: 4a16a50810440e70164e0c01931beba2325ce5e833961f426f0fbad283411f02bafd85ffd16faf67105e2239afaef91486554f81942f050697fbf915c99e0725

data/bin/hypertodo

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+
+require 'hypertodo'
+
+Hypertodo::Command.run(ARGV)

data/lib/hypertodo.rb

@@ -4,6 +4,3 @@ require "hypertodo/db"
 require "hypertodo/task"
 require "hypertodo/version"
 
-module Hypertodo
-  # Your code goes here...
-end

data/lib/hypertodo/command.rb

@@ -1,86 +1,92 @@
 # coding: utf-8
-class Command
 
-  def self.run(argv)
-    new(argv).execute
-  end
+module Hypertodo
 
-  def initialize(argv)
-    @argv = argv
-  end
+  class Command
 
-  def execute
-    options     = Options.parse!(@argv)
-    sub_command = options.delete(:command)
-
-    DB.prepare
-
-    tasks = case sub_command:
-            when 'create'
-              create_task(options[:name], options[:content])
-            when 'delete'
-              delete_task(options[:id])
-            when 'update'
-              update_task(options.delete(:id), options)
-            when 'list'
-              find_tasks(options[:status])
-            end
-    display_tasks tasks
-
-  rescue => e
-    abort "Error: #{e.message}"
-  end
+    def self.run(argv)
+      new(argv).execute
+    end
 
-  def create_task(name, content)
-    Task.create!(name: name, content: content).reload
-  end
+    def initialize(argv)
+      @argv = argv
+    end
 
-  def delete_task(id)
-    task = Task.find(id)
-    task.destroy
-  end
+    def execute
+      options     = Options.parse!(@argv)
+      sub_command = options.delete(:command)
+
+      DB.prepare
+
+      tasks = case sub_command
+              when 'create'
+                create_task(options[:name], options[:content])
+              when 'delete'
+                delete_task(options[:id])
+              when 'update'
+                update_task(options.delete(:id), options)
+              when 'list'
+                find_tasks(options[:status])
+              end
+      display_tasks tasks
+
+    rescue => e
+      abort "Error: #{e.message}"
+    end
 
-  def update_task(id, attributes)
-    if status_name = attributes[:status]
-      attributes[:status] = Task::STATUS.fetch(status_name.upcase)
+    def create_task(name, content)
+      # タスク作成時のstatusはデフォルト値が使われNOT_YETとなる
+      Task.create!(name: name, content: content).reload
     end
 
-    task = Task.find(id)
-    task.update_attributes! attributes
+    def delete_task(id)
+      task = Task.find(id)
+      task.destroy
+    end
 
-    task.reload
-  end
+    def update_task(id, attributes)
+      if status_name = attributes[:status]
+        attributes[:status] = Task::STATUS.fetch(status_name.upcase)
+      end
 
-  def find_tasks(status_name)
-    all_tasks = Task.order('created_at DESC')
+      task = Task.find(id)
+      task.update_attributes! attributes
 
-    if status_name
-      status = Task::STATUS.fetch(status_name.upcase)
-      all_tasks.status_is(status)
-    else
-      all_tasks
+      task.reload
     end
-  end
 
-  private
+    def find_tasks(status_name)
+      all_tasks = Task.order('created_at DESC')
+
+      if status_name
+        status = Task::STATUS.fetch(status_name.upcase)
+        all_tasks.status_is(status)
+      else
+        all_tasks
+      end
+    end
 
-  def display_tasks(tasks)
-    header = display_format('ID', 'Name', 'Content', 'Status')
+    private
 
-    puts header
-    puts '-' * header.size
-    Array(tasks).each do |task|
-      puts display_format(task.id, task.name, task.content, task.status_name)
+    def display_tasks(tasks)
+      header = display_format('ID', 'Name', 'Content', 'Status')
+
+      puts header
+      puts '-' * header.size
+      Array(tasks).each do |task|
+        puts display_format(task.id, task.name, task.content, task.status_name)
+      end
     end
-  end
 
-  def display_format(id, content, status)
-    name_length    = 20 - full_width_count(name)
-    content_length = 40 = full_width_count(content)
-    [id.to_s.rjust(4), name.ljust(20), content,ljust(38), status.ljust(8)].join(' | ')
-  end
+    def display_format(id, name, content, status)
+      name_length    = 20 - full_width_count(name)
+      content_length = 38 - full_width_count(content)
+      [id.to_s.rjust(4), name.ljust(name_length), content.ljust(content_length), status.ljust(8)].join(' | ')
+    end
 
-  def full_width_count(string)
-    string.each_char.select{|char| !(/[ -~。-゜]/.match(char)) }.count
+    def full_width_count(string)
+      string.each_char.select{ |char| !(/[ -~｡-ﾟ]/.match(char)) }.count
+    end
   end
+
 end

data/lib/hypertodo/command/options.rb

@@ -1,100 +1,113 @@
 # coding: utf-8
 
 require 'optparse'
-module Options
 
-  def self.parse!(argv)
-    options = {}
+module Hypertodo
 
-    sub_command_parsers = create_sub_command_parsers
-    command_parser      = create_command_parser
+  class Command
 
-    begin
-      sub_command_parsers[options[:command]].parse! argv
+    module Options
 
-      if %w(update delete).include?(options[:command])
-        raise ArgumentError, "#{options[:command]} id not found." if argv.empty?
-        options[:id] = Integer(argv.first)
-      end
-      rescue OptionParser::MissingArgument, OptionParser::InvalidOption, ArgumentError => e
-        abort e.message
-      end
-      command_parser.order!(argv)
-
-      options[:command] = argv.shift
+      def self.parse!(argv)
+        options = {}
 
-      sub_command_parsers[options[:command]].parse!(argv)
-      rescue OptionParser::MissingArgument, OptionParser::InvalidOption, ArgumentError => e
-      abort e.message
-    end
-  end
+        sub_command_parsers = create_sub_command_parsers
+        command_parser      = create_command_parser
 
-  def self.create_sub_command_parsers(options)
-    sub_command_parsers = Hash.new do |k, v|
-      raise ArgumentError, "'#{v}' is not todo sub command."
-    end
+        # analysis
+        begin
+          command_parser.order! argv
 
-    sub_command_parsers['create'] = OptionParser.new do |opt|
-      opt.banner = 'Usage: create <args>'
-      opt.on('-n VAL', '--name=VAL',    'task name')    {|v| options[:name]    = v }
-      opt.on('-c VAL', '--content=VAL', 'task content') {|v| options[:content] = v }
-      opt.on_tail('-h', '--help', 'Show this message')  {|v| help_sub_command(opt) }
-    end
+          options[:command] = argv.shift
 
-    sub_command_parsers['list'] = OptionParser.new do |opt|
-      opt.banner = 'Usage: list <args>'
-      opt.on('-s VAL', '--status=VAL',  'list status') {|v| options[:status]  = v }
-      opt.on_tail('-h', '--help', 'Show this message') {|v| help_sub_command(opt) }
-    end
+          sub_command_parsers[options[:command]].parse! argv
 
-    sub_command_parsers['update'] = OptionParser.new do |opt|
-      opt.banner = 'Usage: update id <args>'
-      opt.on('-n VAL', '--name=VAL',    'update name')    {|v| options[:name]    = v }
-      opt.on('-c VAL', '--content=VAL'  'update content') {|v| options[:content] = v }
-      opt.on('-s VAL', '--status=VAL',  'update status')  {|v| options[:status]  = v }
-      opt.on_tail('-h', '--help', 'Shoe this message')    {|v| help_sub_command(opt) }
-    end
+          if %w(update delete).include?(options[:command])
+            raise ArgumentError, "#{options[:command]} id not found." if argv.empty?
+            options[:id] = Integer(argv.first)
+          end
+        rescue OptionParser::MissingArgument, OptionParser::InvalidOption, ArgumentError => e
+          abort e.message
+        end
 
-    sub_command_parsers['delete'] = OptionParser.new do |opt|
-      opt.banner = 'Usage: delete id'
-      opt.on_tail('-h', '--help', 'Show this message') {|v| help_sub_command(opt) }
-    end
-
-    sub_command_parsers
-  end
-
-  def self.help_sub_command(parser)
-    puts parser.help
-    exit
-  end
+        options
+      end
 
-  def self.create_command_parser
-    OptionParser.new do |opt|
-      sub_command_help = [
-        {name: 'create -n name -c content',              summary: 'Create Todo Task'},
-        {name: 'update id -n name -c content -s status', summary: 'Update Todo Task'},
-        {name: 'list   -s status',                       summary: 'List   Todo Tasks'},
-        {name: 'delete id',                              summary: 'Delete Todo Task'}
-      ]
-      opt.banner = "Usage: #{opt.program_name} [-h|--help][-v|--version] <command> [<args>]"
-      opt.separator ''
-      opt.separator "#{opt.program_name} Available Commands:"
-      sub_command_help.each do |command|
-        opt.separator [opt.summary_indent, command[:name].ljust(40), command[:summary]].join(' ')
+      def self.create_sub_command_parsers(options)
+        sub_command_parsers = Hash.new do |k, v|
+          raise ArgumentError, "'#{v}' is not todo sub command."
+        end
+
+        sub_command_parsers['create'] = OptionParser.new do |opt|
+          opt.banner = 'Usage: create <args>'
+          opt.on('-n VAL', '--name=VAL',    'task name')    {|v| options[:name]    = v }
+          opt.on('-c VAL', '--content=VAL', 'task content') {|v| options[:content] = v }
+          opt.on_tail('-h', '--help', 'Show this message')  {|v| help_sub_command(opt) }
+        end
+
+        sub_command_parsers['list'] = OptionParser.new do |opt|
+          opt.banner = 'Usage: list <args>'
+          opt.on('-s VAL', '--status=VAL',  'list status') {|v| options[:status]  = v }
+          opt.on_tail('-h', '--help', 'Show this message') {|v| help_sub_command(opt) }
+        end
+
+        sub_command_parsers['update'] = OptionParser.new do |opt|
+          opt.banner = 'Usage: update id <args>'
+          opt.on('-n VAL', '--name=VAL',    'update name')    {|v| options[:name]    = v }
+          opt.on('-c VAL', '--content=VAL'  'update content') {|v| options[:content] = v }
+          opt.on('-s VAL', '--status=VAL',  'update status')  {|v| options[:status]  = v }
+          opt.on_tail('-h', '--help', 'Shoe this message')    {|v| help_sub_command(opt) }
+        end
+
+        sub_command_parsers['delete'] = OptionParser.new do |opt|
+          opt.banner = 'Usage: delete id'
+          opt.on_tail('-h', '--help', 'Show this message') {|v| help_sub_command(opt) }
+        end
+
+        sub_command_parsers
       end
 
-      opt.on_head('-h', '--help', 'Show this message') do |v|
-        puts opt.help
+      def self.help_sub_command(parser)
+        puts parser.help
         exit
       end
 
-      opt.on_head('-v', '--version', 'Show program version') do |v|
-        opt.version = Todo::VERSION
-        puts opt.ver
+      def self.create_command_parser
+        OptionParser.new do |opt|
+          sub_command_help = [
+            {name: 'create -n name -c content',              summary: 'Create Todo Task'},
+            {name: 'update id -n name -c content -s status', summary: 'Update Todo Task'},
+            {name: 'list   -s status',                       summary: 'List   Todo Tasks'},
+            {name: 'delete id',                              summary: 'Delete Todo Task'}
+          ]
+          opt.banner = "Usage: #{opt.program_name} [-h|--help][-v|--version] <command> [<args>]"
+          opt.separator ''
+          opt.separator "#{opt.program_name} Available Commands:"
+          sub_command_help.each do |command|
+            opt.separator [opt.summary_indent, command[:name].ljust(40), command[:summary]].join(' ')
+          end
+
+          opt.on_head('-h', '--help', 'Show this message') do |v|
+            puts opt.help
+            exit
+          end
+
+          opt.on_head('-v', '--version', 'Show program version') do |v|
+            opt.version = Todo::VERSION
+            puts opt.ver
+            exit
+          end
+        end
+      end
+
+      def self.help_sub_command(parser)
+        puts parse.help
         exit
       end
+
+      private_class_method :create_sub_command_parsers, :create_command_parser, :help_sub_command
     end
+
   end
 
-  private_class_method :create_sub_command_parsers, :create_command_parser, :help_sub_command
 end

data/lib/hypertodo/version.rb

@@ -1,3 +1,3 @@
 module Hypertodo
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hypertodo
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - chansuke
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-16 00:00:00.000000000 Z
+date: 2015-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -109,8 +109,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/console
-- bin/setup
+- bin/hypertodo
 - exe/hypertodo
 - hypertodo.gemspec
 - lib/hypertodo.rb

data/bin/console

@@ -1,13 +0,0 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "hypertodo"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-require "pry"
-Pry.start
-
-Todo::Command.run(ARGV)

data/bin/setup

@@ -1,7 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-IFS=$'\n\t'
-
-bundle install
-
-# Do any other automated setup that you need to do here