hiroshimarb 0.1.3 → 0.1.4

data/README.md

@@ -54,3 +54,9 @@ Hiroshima.rb についての情報を表示します。
     $ hiroshimarb event
 
 Hiroshima.rb の次回のイベントについての情報を表示します。
+
+### aa コマンド
+
+    $ hiroshimarb aa
+
+Hiroshima.rb のアスキーアートを表示します。

data/features/aa.feature

@@ -0,0 +1,25 @@
+# language: ja
+機能: hiroshima.rb のアスキーアートを表示する
+  サブコマンド `aa` を使用すると hiroshima.rb のアスキーアートを表示できる
+
+    $ hiroshimarb aa
+
+  シナリオ: アスキーアートを表示
+    もし "hiroshimarb aa" を実行
+    ならば 以下の内容を表示:
+      """
+      ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+      |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||tf||||||||fl|||
+      |||||          ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||ll||||||tll||||
+      ||||  ||||||||  |||||  ||||||||||||||||||||||||||||||||||||||||/  ||||||||||||||||||||||||||||||||||||||||||||||||||||||  ||||||||||||||tllt||fllll|||||
+      |||  ||||||||||  ||||  ||||||||  |||||||||||||||||||||||||||||||  |||||||  |||||||||||||||||||||||||||||||||||||||||||||  |||||||||tlt||lllltlllll||||||
+      ||  ||||||||||||  |||  |||||||||||||||||||||||||||||||||||||||||  |||||||||||||||||||||||||||||||||||||||||||| |||||||||  ||||||||||tllllllllllll|||||||
+      |||  ||||||||||  ||||  i     ||  |  :    |||||     ||||f   |||||  .  . ||  |  ;    ||    ,|||||       ||||||||      .|||       ||||||flllllllllllllltff|
+      ||||  ||||||||  |||||    |||  |  |   |||  ||   |||  ||  :|||||||  l||l  |  |   |||.   |||  .|,  |||   ||||||||  f|||  ||   |||   |||fllllllllllllllltf||
+      ||||||  ||||  |||||||  |||||| |  |  |||||  |  ||||| ||        .| |||||| |  |  |||||  |||||  |  |||||  ||||||||  ||||f  |  |||||  ||||||||fllllllf|||||||
+      |||||||      ||||||||  |||||| |  |  ||||||||. .|||  ||||||||  || |||||| |  |  |||||  |||||  |,  |||   ||||||||  ||||||||   |||  |||||||t||tlllllll||||||
+      |||||||||  ||||||||||  |||||| |  |  ||||||||||     ||||||.  |||l |||||| |  |  |||||. |||||. |||:   f  |||  |||  |||||||f .     ||||||tf|||||tt||ftlt||||
+      |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||ft||||||||f||||||||||
+      ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+
+      """

data/features/event.feature

@@ -4,13 +4,25 @@
 
      $ hiroshimarb event
 
-   シナリオ: イベントについての表示
+   シナリオ: もっとも近いイベントについての表示
      もし "hiroshimarb event" を実行
+     ならば 以下の内容を表示:
+       """
+       2012-12-01 (土) 14:00-18:00 広島Ruby勉強会 #026
+
+         http://hiroshimarb.github.com/blog/2012/11/16/hiroshimarb-26/
+
+       """
+   シナリオ: イベントについての表示
+     もし "hiroshimarb event all" を実行
      ならば 以下の内容を表示:
        """
        2012-11-03 (土) 14:00-18:00 広島Ruby勉強会 #025
 
          http://hiroshimarb.github.com/blog/2012/10/15/hiroshimarb-25/
 
+       2012-12-01 (土) 14:00-18:00 広島Ruby勉強会 #026
+
+         http://hiroshimarb.github.com/blog/2012/11/16/hiroshimarb-26/
 
        """

data/lib/hiroshimarb/command.rb

@@ -0,0 +1,34 @@
+module Hiroshimarb
+
+  # コマンドを実装する際の基底クラス
+  class Command
+
+    class << self
+
+      def commands
+        @commands ||= {}
+      end
+
+      def inherited(subclass)
+        name = subclass.command_name
+        commands[name] = subclass
+      end
+
+      def find(command_name)
+        if command = commands[command_name.to_sym]
+          command.new
+        else
+          nil
+        end
+      end
+
+      def command_name
+        name.split('::').last.downcase.to_sym
+      end
+    end
+
+    def call(arg)
+    end
+
+  end
+end

data/lib/hiroshimarb/commands/aa.rb

@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+require 'hiroshimarb/command'
+
+module Hiroshimarb::Commands
+  class Aa < Hiroshimarb::Command
+    def call(*args)
+      puts <<EOD
+||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||tf||||||||fl|||
+|||||          ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||ll||||||tll||||
+||||  ||||||||  |||||  ||||||||||||||||||||||||||||||||||||||||/  ||||||||||||||||||||||||||||||||||||||||||||||||||||||  ||||||||||||||tllt||fllll|||||
+|||  ||||||||||  ||||  ||||||||  |||||||||||||||||||||||||||||||  |||||||  |||||||||||||||||||||||||||||||||||||||||||||  |||||||||tlt||lllltlllll||||||
+||  ||||||||||||  |||  |||||||||||||||||||||||||||||||||||||||||  |||||||||||||||||||||||||||||||||||||||||||| |||||||||  ||||||||||tllllllllllll|||||||
+|||  ||||||||||  ||||  i     ||  |  :    |||||     ||||f   |||||  .  . ||  |  ;    ||    ,|||||       ||||||||      .|||       ||||||flllllllllllllltff|
+||||  ||||||||  |||||    |||  |  |   |||  ||   |||  ||  :|||||||  l||l  |  |   |||.   |||  .|,  |||   ||||||||  f|||  ||   |||   |||fllllllllllllllltf||
+||||||  ||||  |||||||  |||||| |  |  |||||  |  ||||| ||        .| |||||| |  |  |||||  |||||  |  |||||  ||||||||  ||||f  |  |||||  ||||||||fllllllf|||||||
+|||||||      ||||||||  |||||| |  |  ||||||||. .|||  ||||||||  || |||||| |  |  |||||  |||||  |,  |||   ||||||||  ||||||||   |||  |||||||t||tlllllll||||||
+|||||||||  ||||||||||  |||||| |  |  ||||||||||     ||||||.  |||l |||||| |  |  |||||. |||||. |||:   f  |||  |||  |||||||f .     ||||||tf|||||tt||ftlt||||
+|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||ft||||||||f||||||||||
+||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+EOD
+    end
+  end
+end

data/lib/hiroshimarb/commands/event.rb

@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+module Hiroshimarb::Commands
+  class Event < Hiroshimarb::Command
+    def call(*args)
+      sub_command = args.first
+      if sub_command == "all"
+        puts all
+      else
+        puts recent
+      end
+    end
+
+    def recent
+      <<EOD
+2012-12-01 (土) 14:00-18:00 広島Ruby勉強会 #026
+
+  http://hiroshimarb.github.com/blog/2012/11/16/hiroshimarb-26/
+EOD
+    end
+
+    def all
+      rest = <<EOD
+2012-11-03 (土) 14:00-18:00 広島Ruby勉強会 #025
+
+  http://hiroshimarb.github.com/blog/2012/10/15/hiroshimarb-25/
+
+EOD
+      rest + recent
+    end
+  end
+end

data/lib/hiroshimarb/commands/help.rb

@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+require 'hiroshimarb/command'
+
+module Hiroshimarb::Commands
+  class Help < Hiroshimarb::Command
+    def call(*args)
+      puts <<EOD
+Usage: hiroshimarb command
+Available commands:
+  open    : open the website relevant to Hiroshima in a web browser
+          : subcommands
+          :    hiroshimarb - Hiroshim.rb [default]
+          :    ipad        - 広島弁吹替シリーズ
+          :    oc-h        - おしい広島県
+          :    city        - 広島市
+          :    pref        - 広島県
+  info    : disploy information of Hiroshimar.rb
+  member  : display the member of Hiroshima.rb
+  event   : display next event of Hiroshima.rb
+  aa      : display ascii art of Hiroshima.rb
+EOD
+    end
+  end
+end

data/lib/hiroshimarb/commands/info.rb

@@ -0,0 +1,9 @@
+require 'hiroshimarb/information'
+
+module Hiroshimarb::Commands
+  class Info < Hiroshimarb::Command
+    def call(*args)
+      puts Hiroshimarb::Information.information
+    end
+  end
+end

data/lib/hiroshimarb/commands/member.rb

@@ -0,0 +1,13 @@
+require 'hiroshimarb/member'
+
+module Hiroshimarb::Commands
+  class Member < Hiroshimarb::Command
+    def call(*args)
+      Hiroshimarb::Member.all.reduce(nil) do |acc, member|
+        puts acc if acc
+        puts member.to_s
+        acc = '-'*80
+      end
+    end
+  end
+end

data/lib/hiroshimarb/commands/open.rb

@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+require 'rubygems'
+require 'launchy'
+require 'uri'
+require 'hiroshimarb/command'
+
+module Hiroshimarb::Commands
+  class Open < Hiroshimarb::Command
+
+    @@default_key = 'hiroshimarb'
+
+    def call(*args)
+      command = args.first
+      command ||= @@default_key
+      Launchy.open key2url(command)
+    end
+
+    def key2url(key)
+      case key
+      when 'hiroshimarb'
+        'http://hiroshimarb.github.com'
+      when 'oc-h'
+        'http://oc-h.jp'
+      when 'ipad'
+        URI.encode 'http://kita.dyndns.org/wiki/?広島弁吹き替えシリーズ'
+      when 'city'
+        'http://www.city.hiroshima.lg.jp'
+      when 'pref'
+        'http://www.pref.hiroshima.lg.jp'
+      end
+    end
+  end
+end

data/lib/hiroshimarb/commands.rb

@@ -0,0 +1,9 @@
+module Hiroshimarb::Commands
+  def self.load_commands
+    commands_dir = File.join(File.dirname(__FILE__), "commands")
+    path = File.join(commands_dir, "*.rb")
+    Dir.glob(path).each do |file|
+      require file
+    end
+  end
+end

data/lib/hiroshimarb/version.rb

@@ -1,3 +1,3 @@
 module Hiroshimarb
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/lib/hiroshimarb.rb

@@ -1,29 +1,24 @@
 require "hiroshimarb/version"
-require 'hiroshimarb/cli'
 
 module Hiroshimarb
-  extend CLI
-
-  autoload(:Information, "hiroshimarb/information")
-  autoload(:Open, "hiroshimarb/open")
+  autoload(:Command, "hiroshimarb/command")
+  autoload(:Commands, "hiroshimarb/commands")
 
   class << self
     def execute(argv)
+      Commands.load_commands
       return help if argv.count == 0
 
-      command = argv.shift
-      case command
-      when 'open'
-        open *argv
-      when 'info'
-        info
-      when 'member'
-        member
-      when 'event'
-        event
+      first = argv.shift
+      if command = Command.find(first)
+        command.call *argv
       else
         help
       end
     end
+
+    def help(*argv)
+      Commands::Help.new.call *argv
+    end
   end
 end

data/spec/hiroshimarb/command_spec.rb

@@ -0,0 +1,15 @@
+require 'hiroshimarb/command'
+
+class Sample < Hiroshimarb::Command
+end
+
+module Hiroshimarb
+  describe Command do
+    describe '.find' do
+      subject { Command.find command }
+      let(:command) { 'sample' }
+      it { should be_kind_of(Command) }
+      it { should be_kind_of(Sample) }
+    end
+  end
+end

data/spec/hiroshimarb_spec.rb

@@ -1,48 +1,17 @@
 # -*- coding: utf-8 -*-
 require 'hiroshimarb'
+require 'launchy'
 
 describe Hiroshimarb do
   describe '.execute' do
     subject { Hiroshimarb.execute argv }
-    context "when 第1引数が 'open'" do
-      let(:argv) { ['open', 'hiroshimarb'] }
 
-      it "open メソッドが呼ばれる" do
-        Hiroshimarb.should_receive(:open).with('hiroshimarb')
-        subject
-      end
-    end
-
-    context "when 第1引数が 'info'" do
-      let(:argv) { ['info'] }
-
-      it "info メソッドが呼ばれる" do
-        Hiroshimarb.should_receive(:info)
-        subject
-      end
-    end
-
-    context "when 第1引数が 'member'" do
-      let(:argv) { ['member'] }
+    let(:argv) { %w{open} }
 
-      it "member メソッドが呼ばれる" do
-        Hiroshimarb.should_receive(:member)
-        subject
-      end
+    before :each do
+      Hiroshimarb::Command.should_receive(:find) { proc { "open!!" } }
     end
 
-    context "when 引数がない場合'" do
-      let(:argv) { [] }
-
-      it "help メソッドが呼ばれる" do
-        Hiroshimarb.should_receive(:help)
-        subject
-      end
-    end
-  end
-
-  describe "Infomation" do
-    subject { Hiroshimarb::Information }
-    its(:class) { should eq(Class) }
+    it { should eq("open!!") }
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hiroshimarb
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -23,7 +23,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-30 00:00:00.000000000 Z
+date: 2012-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: launchy
@@ -89,20 +89,27 @@ files:
 - README.md
 - Rakefile
 - bin/hiroshimarb
+- features/aa.feature
 - features/event.feature
 - features/info.feature
 - features/step_definitions/default_steps.rb
 - features/support/env.rb
 - hiroshimarb.gemspec
 - lib/hiroshimarb.rb
-- lib/hiroshimarb/cli.rb
+- lib/hiroshimarb/command.rb
+- lib/hiroshimarb/commands.rb
+- lib/hiroshimarb/commands/aa.rb
+- lib/hiroshimarb/commands/event.rb
+- lib/hiroshimarb/commands/help.rb
+- lib/hiroshimarb/commands/info.rb
+- lib/hiroshimarb/commands/member.rb
+- lib/hiroshimarb/commands/open.rb
 - lib/hiroshimarb/dsl.rb
 - lib/hiroshimarb/information.rb
 - lib/hiroshimarb/member.rb
-- lib/hiroshimarb/open.rb
 - lib/hiroshimarb/version.rb
 - resource/member.rb
-- spec/hiroshimarb/cli_spec.rb
+- spec/hiroshimarb/command_spec.rb
 - spec/hiroshimarb/dsl_spec.rb
 - spec/hiroshimarb/information_spec.rb
 - spec/hiroshimarb/member_spec.rb
@@ -132,11 +139,12 @@ signing_key:
 specification_version: 3
 summary: provide `hiroshimarb` command. hiroshimarb is Hiroshima.rb
 test_files:
+- features/aa.feature
 - features/event.feature
 - features/info.feature
 - features/step_definitions/default_steps.rb
 - features/support/env.rb
-- spec/hiroshimarb/cli_spec.rb
+- spec/hiroshimarb/command_spec.rb
 - spec/hiroshimarb/dsl_spec.rb
 - spec/hiroshimarb/information_spec.rb
 - spec/hiroshimarb/member_spec.rb

data/lib/hiroshimarb/cli.rb

@@ -1,56 +0,0 @@
-# -*- coding: utf-8 -*-
-require 'hiroshimarb/member'
-require 'rubygems'
-require 'launchy'
-require 'uri'
-
-module Hiroshimarb
-  # コマンドラインから呼びだされる場合のサブコマンドを実装する
-  module CLI
-    # Hiroshim.rbのウェブサイトをブラウザで開く
-    def open(key = nil)
-      Open.open(key)
-    end
-
-    # Hiroshim.rbの情報を標準出力へ表示
-    def info
-      puts Information.information
-    end
-
-    # Hiroshima.rbのメンバーを標準出力へ表示
-    def member
-      Member.all.reduce(nil) do |acc, member|
-        puts acc if acc
-        puts member.to_s
-        acc = '-'*80
-      end
-    end
-
-    # Hiroshima.rbのイベントを標準出力へ表示
-    def event
-      puts <<EOD
-2012-11-03 (土) 14:00-18:00 広島Ruby勉強会 #025
-
-  http://hiroshimarb.github.com/blog/2012/10/15/hiroshimarb-25/
-
-EOD
-    end
-
-    def help
-        puts <<EOD
-Usage: hiroshimarb command
-Available commands:
-  open    : open the website relevant to Hiroshima in a web browser
-          : subcommands
-          :    hiroshimarb - Hiroshim.rb [default]
-          :    ipad        - 広島弁吹替シリーズ
-          :    oc-h        - おしい広島県
-          :    city        - 広島市
-          :    pref        - 広島県
-  info    : disploy information of Hiroshimar.rb
-  member  : display the member of Hiroshima.rb
-  event   : display next event of Hiroshima.rb
-EOD
-    end
-  end
-end

data/lib/hiroshimarb/open.rb

@@ -1,26 +0,0 @@
-# -*- coding: utf-8 -*-
-require 'rubygems'
-require 'launchy'
-
-module Hiroshimarb
-  class Open
-    class << self
-      def open(key = nil)
-        key ||= 'hiroshimarb'
-        url = case key
-              when 'hiroshimarb'
-                'http://hiroshimarb.github.com'
-              when 'oc-h'
-                'http://oc-h.jp'
-              when 'ipad'
-                URI.encode 'http://kita.dyndns.org/wiki/?広島弁吹き替えシリーズ'
-              when 'city'
-                'http://www.city.hiroshima.lg.jp'
-              when 'pref'
-                'http://www.pref.hiroshima.lg.jp'
-              end
-        Launchy.open url
-      end
-    end
-  end
-end

data/spec/hiroshimarb/cli_spec.rb

@@ -1,91 +0,0 @@
-# -*- coding: utf-8 -*-
-require 'hiroshimarb/cli'
-
-describe Hiroshimarb::CLI do
-  let(:cli) do
-    Object.new.extend Hiroshimarb::CLI
-  end
-
-  let(:stdout) do
-    $stdout.seek 0
-    $stdout.read
-  end
-
-  before :each do
-    $stdout = StringIO.new
-  end
-
-  describe '#open' do
-    subject { cli.open(arg) }
-
-    context '引数なし' do
-      let(:arg) { nil }
-      it "Hiroshima.rbのウェブサイトを表示" do
-        Launchy.should_receive(:open).with('http://hiroshimarb.github.com')
-        subject
-      end
-    end
-
-    context '引数 "oc-h"' do
-      let(:arg) { "oc-h" }
-      it "おしい広島県のウェブサイトを表示" do
-        Launchy.should_receive(:open).with('http://oc-h.jp')
-        subject
-      end
-    end
-
-    context '引数 "ipad"' do
-      let(:arg) { "ipad" }
-      it "広島弁吹替シリーズのサイトを表示" do
-        Launchy.should_receive(:open).with('http://kita.dyndns.org/wiki/?%E5%BA%83%E5%B3%B6%E5%BC%81%E5%90%B9%E3%81%8D%E6%9B%BF%E3%81%88%E3%82%B7%E3%83%AA%E3%83%BC%E3%82%BA')
-        subject
-      end
-    end
-
-    context '引数 "city"' do
-      let(:arg) { 'city' }
-      it '広島市のサイトを表示' do
-        Launchy.should_receive(:open).with('http://www.city.hiroshima.lg.jp')
-        subject
-      end
-    end
-
-    context '引数 "pref"' do
-      let(:arg) { 'pref' }
-      it '広島市のサイトを表示' do
-        Launchy.should_receive(:open).with('http://www.pref.hiroshima.lg.jp')
-        subject
-      end
-    end
-  end
-
-  describe '#info' do
-    subject { cli.info }
-    it "Hiroshima.rbについて出力される" do
-      subject
-      expect(stdout).to match("Hiroshima.rbについて")
-    end
-
-    it "イベントについて出力される" do
-      subject
-      expect(stdout).to match("勉強会やもくもくする会")
-    end
-  end
-
-  describe '#member' do
-    subject { cli.member }
-    it 'Hiroshim.rbのメンバーを出力' do
-      Hiroshimarb::Member.stub(:all) { %W{hoge mogu}  }
-      subject
-      expect(stdout).to eq("hoge\n" + '-'*80 + "\nmogu\n")
-    end
-  end
-
-  describe '#help' do
-    subject { cli.help }
-    it '使い方を出力' do
-      subject
-      expect(stdout).to match("Usage")
-    end
-  end
-end