logaling-command 0.0.1 → 0.0.2

data/.rspec

@@ -1 +1,2 @@
 --color
+--format documentation

data/Rakefile

@@ -1,6 +1,7 @@
-require 'bundler/gem_tasks'
-require "rspec/core/rake_task"
+require 'bundler'
+Bundler::GemHelper.install_tasks
 
+require "rspec/core/rake_task"
 desc "Run all specs"
 RSpec::Core::RakeTask.new(:spec) do |t|
   t.verbose = true

data/lib/logaling.rb

@@ -3,5 +3,7 @@
 require "logaling/command"
 
 module Logaling
-  class CommandFailed < RuntimeError; end
+  class LogalingError < RuntimeError; end
+  class TermError < LogalingError; end
+  class CommandFailed < LogalingError; end
 end

data/lib/logaling/command.rb

@@ -5,7 +5,7 @@ require "logaling/glossary"
 require "logaling/glossary_db"
 
 class Logaling::Command < Thor
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 
   map '-c' => :create,
       '-a' => :add,
@@ -13,15 +13,10 @@ class Logaling::Command < Thor
       '-u' => :update,
       '-l' => :lookup
 
-  class_option :glossary, type: :string, aliases: "-g"
-  class_option :source_language, type: :string, aliases: "-S"
-  class_option :target_language, type: :string, aliases: "-T"
-  class_option :logaling_home, type: :string, required: false, aliases: "-h"
-
-  def initialize(*args)
-    super
-    @dot_options = Hash.new
-  end
+  class_option "glossary",        type: :string, aliases: "-g"
+  class_option "source-language", type: :string, aliases: "-S"
+  class_option "target-language", type: :string, aliases: "-T"
+  class_option "logaling-home",   type: :string, required: false, aliases: "-h"
 
   desc 'create', 'Create glossary.'
   def create
@@ -31,52 +26,42 @@ class Logaling::Command < Thor
     error(e.message)
   end
 
-  desc 'add', 'Add term to glossary.'
-  method_option :source_term, type: :string, required: true, aliases: "-s"
-  method_option :target_term, type: :string, required: true, aliases: "-t"
-  method_option :note, type: :string, aliases: "-n"
-  def add
+  desc 'add [source term] [target term] [note]', 'Add term to glossary.'
+  def add(source_term, target_term, note='')
     load_config
-    glossary.add(options[:source_term], options[:target_term], options[:note])
-  rescue Logaling::CommandFailed => e
+    glossary.add(source_term, target_term, note)
+  rescue Logaling::CommandFailed, Logaling::TermError => e
     error(e.message)
   end
 
-  desc 'delete', 'Delete term.'
-  method_option :source_term, type: :string, required: true, aliases: "-s"
-  method_option :target_term, type: :string, required: true, aliases: "-t"
-  def delete
+  desc 'delete [source term] [target term]', 'Delete term.'
+  def delete(source_term, target_term)
     load_config
-    glossary.delete(options[:source_term], options[:target_term])
-  rescue Logaling::CommandFailed => e
+    glossary.delete(source_term, target_term)
+  rescue Logaling::CommandFailed, Logaling::TermError => e
     error(e.message)
   end
 
-  desc 'update', 'Update term.'
-  method_option :source_term, type: :string, required: true, aliases: "-s"
-  method_option :target_term, type: :string, required: true, aliases: "-t"
-  method_option :new_target_term, type: :string, required: true, aliases: "-nt"
-  method_option :note, type: :string, required: true, aliases: "-n"
-  def update
+  desc 'update [source term] [target term] [new_target_term], [note]', 'Update term.'
+  def update(source_term, target_term, new_target_term, note='')
     load_config
-    glossary.update(options[:source_term], options[:target_term], options[:new_target_term], options[:note])
-  rescue Logaling::CommandFailed => e
+    glossary.update(source_term, target_term, new_target_term, note)
+  rescue Logaling::CommandFailed, Logaling::TermError => e
     error(e.message)
   end
 
-  desc 'lookup', 'Lookup terms.'
-  method_option :source_term, type: :string, required: true, aliases: "-s"
-  def lookup
+  desc 'lookup [source term]', 'Lookup terms.'
+  def lookup(source_term)
     load_config
-    glossary.lookup(options[:source_term])
-  rescue Logaling::CommandFailed => e
+    glossary.lookup(source_term)
+  rescue Logaling::CommandFailed, Logaling::TermError => e
     error(e.message)
   end
 
   desc 'index', 'Index glossaries to groonga DB.'
   def index
     load_config
-    home = find_option("logaling_home") || LOGALING_HOME
+    home = find_option("logaling-home") || LOGALING_HOME
     db_home = File.join(home, ".logadb")
     glossarydb = Logaling::GlossaryDB.new
     glossarydb.open(db_home, "utf8") do |db|
@@ -90,13 +75,13 @@ class Logaling::Command < Thor
     glossary = find_option("glossary")
     raise(Logaling::CommandFailed, "input glossary name '-g <glossary name>'") unless glossary
 
-    source_language = find_option("source_language")
+    source_language = find_option("source-language")
     raise(Logaling::CommandFailed, "input source-language code '-S <source-language code>'") unless source_language
 
-    target_language = find_option("target_language")
+    target_language = find_option("target-language")
     raise(Logaling::CommandFailed, "input target-language code '-T <target-language code>'") unless target_language
 
-    logaling_home = find_option("logaling_home")
+    logaling_home = find_option("logaling-home")
 
     Logaling::Glossary.new(glossary, source_language, target_language, logaling_home)
   end
@@ -111,6 +96,7 @@ class Logaling::Command < Thor
   end
 
   def load_config
+    @dot_options ||= {}
     if path = find_dotfile
       tmp_options = File.readlines(path).map {|l| l.chomp.split " "}
       tmp_options.each do |option|

data/lib/logaling/glossary.rb

@@ -38,8 +38,7 @@ module Logaling
       check_glossary_exists
 
       if bilingual_pair_exists?(source_term, target_term)
-        puts "[#{source_term}] [#{target_term}] pair already exists"
-        return
+        raise TermError, "[#{source_term}] [#{target_term}] pair already exists"
       end
 
       glossary = load_glossary_yml
@@ -52,8 +51,7 @@ module Logaling
       check_glossary_exists
 
       if bilingual_pair_exists?(source_term, new_target_term)
-        puts "[#{source_term}] [#{new_target_term}] pair already exists"
-        return
+        raise TermError, "[#{source_term}] [#{new_target_term}] pair already exists"
       end
 
       glossary = load_glossary_yml
@@ -62,7 +60,7 @@ module Logaling
         glossary[target_index] = rebuild_term(glossary[target_index], source_term, new_target_term, note)
         dump_glossary(glossary)
       else
-        puts "source_term:#{source_term} target_term:#{target_term} not found in glossary #{@path}"
+        raise TermError, "source_term:#{source_term} target_term:#{target_term} not found in glossary #{@path}"
       end
     end
 
@@ -75,7 +73,7 @@ module Logaling
         glossary.delete_at(target_index)
         dump_glossary(glossary)
       else
-        puts "source_term:#{source_term} target_term:#{target_term} not found in glossary #{@path}"
+        raise TermError, "source_term:#{source_term} target_term:#{target_term} not found in glossary #{@path}"
       end
     end
 
@@ -89,8 +87,7 @@ module Logaling
           term[:source_language] != @source_language || term[:target_language] != @target_language
         end
         if glossaries.empty?
-          puts "source_term <#{source_term}> not found"
-          return
+          raise TermError, "source-term <#{source_term}> not found"
         end
         # order by glossary
         specified = glossaries.select{|term| term[:name] == @glossary}
@@ -117,11 +114,12 @@ module Logaling
     end
 
     def build_term(source_term, target_term, note)
+      note ||= ''
       {'source_term' => source_term, 'target_term' => target_term, 'note' => note}
     end
 
     def rebuild_term(current, source_term, target_term, note)
-      note = current['note'] if note == ""
+      note = current['note'] if note.nil? || note == ""
       target_term = current['target_term'] if target_term == ""
       build_term(source_term, target_term, note)
     end

data/logaling-command.gemspec

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
-require "logaling/command.rb"
+require "logaling/command"
 
 Gem::Specification.new do |s|
   s.name        = "logaling-command"
@@ -18,6 +18,9 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
+  s.add_runtime_dependency 'thor', ['>= 0.14.6']
+  s.add_runtime_dependency 'bundler', ['>= 1.0']
+
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec'
 end

data/spec/logaling/command_spec.rb

@@ -0,0 +1,101 @@
+# -*- coding: utf-8 -*-
+require File.join(File.dirname(__FILE__), "..", "spec_helper")
+
+describe Logaling::Command do
+  let(:base_options) { {"glossary"=>"spec", "source-language"=>"en", "target-language"=>"ja"} }
+  let(:command) { Logaling::Command.new([], base_options) }
+  let(:glossary_path) { File.join(LOGALING_HOME, "/spec.en.ja.yml") }
+
+  before do
+    FileUtils.remove_file(glossary_path, true)
+  end
+
+  describe '#create' do
+    context 'with arguments show non-existent glossary' do
+      before do
+        command.create
+      end
+
+      it "glossary yaml should be newly created" do
+        File.exists?(glossary_path).should be_true
+      end
+    end
+  end
+
+  describe '#add' do
+    before do
+      command.create
+    end
+
+    context 'with arguments have only bilingual pair' do
+      before do
+        command.add("spec", "テスト")
+      end
+
+      subject { YAML::load_file(glossary_path).find{|h| h["source_term"] == "spec" }}
+
+      it "glossary yaml should contain that term" do
+        subject["target_term"].should == "テスト"
+      end
+
+      it "term should note have note" do
+        subject["note"].should == ""
+      end
+   end
+
+    context 'with arguments have bilingual pair and note' do
+      before do
+        command.add("spec", "テスト", "備考")
+      end
+
+      subject { YAML::load_file(glossary_path).find{|h| h["source_term"] == "spec" }}
+
+      it "glossary yaml should contain that term" do
+        subject["target_term"].should == "テスト"
+      end
+
+      it "term should have note" do
+        subject["note"].should == "備考"
+      end
+    end
+  end
+
+  describe "#update" do
+    before do
+      command.create
+      command.add("spec", "テスト", "備考")
+    end
+
+    context "not given source-term option" do
+      # should show err
+    end
+
+    context "not given target-term option" do
+      #should show err
+    end
+
+    context "not given new-target-term option" do
+      #should show err
+    end
+
+    context "with arguments except note" do
+      before do
+        command.update("spec", "テスト", "スペック")
+      end
+
+      subject { YAML::load_file(glossary_path).find{|h| h["source_term"] == "spec" }}
+
+      it "term's target_term should be updated" do
+        subject["target_term"].should == "スペック"
+      end
+
+      it "term's note should not be updated" do
+        subject["note"].should == "備考"
+      end
+    end
+  end
+
+  after do
+    FileUtils.remove_file(glossary_path, true)
+  end
+end

data/spec/logaling/glossary_spec.rb

@@ -0,0 +1,116 @@
+# -*- coding: utf-8 -*-
+require File.join(File.dirname(__FILE__), "..", "spec_helper")
+require "fileutils"
+
+module Logaling
+  describe Glossary do
+    let(:glossary) { Glossary.new('spec', 'en', 'ja', Dir.pwd) }
+    let(:glossary_path) { File.join(Dir.pwd, 'spec.en.ja.yml') }
+
+    describe '#add' do
+      before do
+        FileUtils.remove_file(glossary_path, true)
+        glossary.create
+      end
+
+      context 'with arguments show new bilingual pair' do
+        before do
+          glossary.add("spec", "スペック", "テストスペック")
+        end
+
+        it 'glossary yaml should have that bilingual pair' do
+          yaml = YAML::load_file(glossary_path)
+          term = yaml.index({"source_term"=>"spec", "target_term"=>"スペック", "note"=>"テストスペック"})
+          term.should_not be_nil
+        end
+      end
+
+      context 'with arguments show existing bilingual pair' do
+        before do
+          glossary.add("user", "ユーザ", "ユーザーではない")
+        end
+
+        it {
+          -> { glossary.add("user", "ユーザ", "ユーザーではない") }.should raise_error(Logaling::TermError)
+        }
+      end
+
+      after do
+        FileUtils.remove_file(glossary_path, true)
+      end
+    end
+
+    describe '#update' do
+      before do
+        FileUtils.remove_file(glossary_path, true)
+        glossary.create
+        glossary.add("user", "ユーザ", "ユーザーではない")
+      end
+
+      context 'with new-terget-term show existing bilingual pair' do
+        it {
+          -> { glossary.update("user", "ユーザー", "ユーザ", "やっぱりユーザー") }.should raise_error(Logaling::TermError)
+        }
+      end
+
+      context 'with source-term arguments show not existing bilingual pair' do
+        it {
+          -> { glossary.update("use", "ユーザ", "ユーザー", "やっぱりユーザー") }.should raise_error(Logaling::TermError)
+        }
+      end
+
+      context 'with target-term arguments show not existing bilingual pair' do
+        it {
+          -> { glossary.update("user", "ユー", "ユーザー", "やっぱりユーザー") }.should raise_error(Logaling::TermError)
+        }
+      end
+
+      after do
+        FileUtils.remove_file(glossary_path, true)
+      end
+    end
+
+    describe '#delete' do
+      before do
+        FileUtils.remove_file(glossary_path, true)
+        glossary.create
+        glossary.add("user", "ユーザ", "ユーザーではない")
+      end
+
+      context 'with arguments show not existing bilingual pair' do
+        it {
+          -> { glossary.delete("user", "ユーザー") }.should raise_error(Logaling::TermError)
+        }
+      end
+
+      after do
+        FileUtils.remove_file(glossary_path, true)
+      end
+    end
+
+    describe '#lookup' do
+      before do
+        FileUtils.remove_file(glossary_path, true)
+        glossary.create
+        glossary.add("user", "ユーザ", "ユーザーではない")
+
+        db_home = File.join(LOGALING_HOME, ".logadb")
+        glossarydb = Logaling::GlossaryDB.new
+        glossarydb.open(db_home, "utf8") do |db|
+          db.recreate_table(db_home)
+          db.load_glossaries(LOGALING_HOME)
+        end
+      end
+
+      context 'with arguments show not existing bilingual pair' do
+        it {
+          -> { glossary.delete("user", "ユーザー") }.should raise_error(Logaling::TermError)
+        }
+      end
+
+      after do
+        FileUtils.remove_file(glossary_path, true)
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,8 +1,25 @@
-require "rubygems"
-require "bundler/setup"
-
-require 'rspec'
 $LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib')
+require 'logaling'
+
+require "fileutils"
+require 'stringio'
+
+LOGALING_HOME = File.expand_path("~/.logaling.d")
+
+RSpec.configure do |config|
+  def capture(stream)
+    begin
+      stream = stream.to_s
+      eval "$#{stream} = StringIO.new"
+      yield
+      result = eval("$#{stream}").string
+    ensure
+      eval("$#{stream} = #{stream.upcase}")
+    end
+
+    result
+  end
 
-require 'logaling_command'
+  alias :silence :capture
+end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logaling-command
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,11 +13,33 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-09 00:00:00.000000000Z
+date: 2011-11-16 00:00:00.000000000Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: &2152051920 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.14.6
+  type: :runtime
+  prerelease: false
+  version_requirements: *2152051920
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &2152050600 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2152050600
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2151902900 !ruby/object:Gem::Requirement
+  requirement: &2152049620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -25,10 +47,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151902900
+  version_requirements: *2152049620
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2151901960 !ruby/object:Gem::Requirement
+  requirement: &2152047900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -36,7 +58,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151901960
+  version_requirements: *2152047900
 description: A command line interface for logaling.
 email:
 - koji.shimada@enishi-tech.com
@@ -59,6 +81,8 @@ files:
 - lib/logaling/glossary.rb
 - lib/logaling/glossary_db.rb
 - logaling-command.gemspec
+- spec/logaling/command_spec.rb
+- spec/logaling/glossary_spec.rb
 - spec/spec_helper.rb
 homepage: http://logaling.github.com/
 licenses: []
@@ -85,4 +109,6 @@ signing_key:
 specification_version: 3
 summary: A command line interface for logaling.
 test_files:
+- spec/logaling/command_spec.rb
+- spec/logaling/glossary_spec.rb
 - spec/spec_helper.rb