logaling-command 0.0.3 → 0.0.4

data/lib/logaling/command.rb

@@ -4,7 +4,7 @@ require 'thor'
 require "logaling/glossary"
 
 class Logaling::Command < Thor
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
   LOGALING_CONFIG = '.logaling'
 
   map '-c' => :create,
@@ -13,7 +13,8 @@ class Logaling::Command < Thor
       '-u' => :update,
       '-l' => :lookup,
       '-n' => :new,
-      '-L' => :link
+      '-r' => :register,
+      '-U' => :unregister
 
   class_option "glossary",        type: :string, aliases: "-g"
   class_option "source-language", type: :string, aliases: "-S"
@@ -21,6 +22,7 @@ class Logaling::Command < Thor
   class_option "logaling-home",   type: :string, required: false, aliases: "-h"
 
   desc 'new [PROJECT NAME] [SOURCE LANGUAGE] [TARGET LANGUAGE(optional)]', 'Create .logaling'
+  method_option "no-register", type: :boolean, default: false
   def new(project_name, source_language, target_language=nil)
     unless File.exist?(LOGALING_CONFIG)
       FileUtils.mkdir_p(File.join(LOGALING_CONFIG, "glossary"))
@@ -29,32 +31,49 @@ class Logaling::Command < Thor
         config.puts "--source-language #{source_language}"
         config.puts "--target-language #{target_language}" if target_language
       end
+      register unless options["no-register"]
       say "Successfully created #{LOGALING_CONFIG}"
     else
-      say "#{LOGALING_CONFIG} is already exists."
+      say "#{LOGALING_CONFIG} already exists."
     end
   end
 
-  desc 'link', 'Link .logaling'
-  def link
+  desc 'register', 'Register .logaling'
+  def register
     logaling_path = find_dotfile
     if logaling_path
-      logaling_projects_path = File.join(LOGALING_HOME, "projects")
       FileUtils.mkdir_p(logaling_projects_path) unless File.exist?(logaling_projects_path)
 
       config = load_config
       symlink_path = File.join(logaling_projects_path, config["glossary"])
       unless File.exists?(symlink_path)
         FileUtils.ln_s(logaling_path, symlink_path)
-        say "Your project is now linked to #{symlink_path}."
+        say "Your project is now registered to #{symlink_path}."
       else
-        say "#{options["glossary"]} is already linked."
+        say "#{options["glossary"]} is already registered."
       end
     else
       say "Try 'loga new' first."
     end
   end
 
+  desc 'unregister', 'Unregister .logaling'
+  def unregister
+    logaling_path = find_dotfile
+    if logaling_path
+      config = load_config
+      symlink_path = File.join(logaling_projects_path, config["glossary"])
+      if File.exists?(symlink_path)
+        FileUtils.remove_entry_secure(symlink_path, true)
+        say "Your project is now unregistered."
+      else
+        say ".logaling is not yet registered."
+      end
+    else
+      say ".logaling can't be found."
+    end
+  end
+
   desc 'create', 'Create glossary.'
   def create
     glossary.create
@@ -114,6 +133,10 @@ class Logaling::Command < Thor
     Logaling::Glossary.new(glossary, source_language, target_language)
   end
 
+  def logaling_projects_path
+    File.join(LOGALING_HOME, "projects")
+  end
+
   def error(msg)
     STDERR.puts(msg)
     exit 1

data/lib/logaling/glossary.rb

@@ -73,7 +73,7 @@ module Logaling
       check_glossary_exists
 
       glossarydb = Logaling::GlossaryDB.new
-      glossarydb.open(File.join(LOGALING_HOME, "db"), "utf8") do |db|
+      glossarydb.open(logaling_db_home, "utf8") do |db|
         glossaries = db.lookup(source_term)
         glossaries.reject! do |term|
           term[:source_language] != @source_language || term[:target_language] != @target_language
@@ -98,10 +98,9 @@ module Logaling
 
     def index
       projects = Dir.glob(File.join(LOGALING_HOME, "projects", "*"))
-      db_home = File.join(LOGALING_HOME, "db")
       glossarydb = Logaling::GlossaryDB.new
-      glossarydb.open(db_home, "utf8") do |db|
-        db.recreate_table(db_home)
+      glossarydb.open(logaling_db_home, "utf8") do |db|
+        db.recreate_table(logaling_db_home)
         projects.each do |project|
           db.load_glossaries(File.join(project, "glossary"))
         end

data/lib/logaling/glossary_db.rb

@@ -47,14 +47,6 @@ module Logaling
       @database.nil? or @database.closed?
     end
 
-    def get_file_list(path, types)
-      glob_list = []
-      types.each do |type|
-        glob_list << File.join(path, "*.#{type}")
-      end
-      Dir.glob(glob_list)
-    end
-
     def load_glossary(file)
       case extname = File.extname(file)
       when ".tsv", ".csv"
@@ -153,5 +145,11 @@ module Logaling
         schema.remove_table("terms")
       end
     end
+
+    def get_file_list(path, types)
+      glob_list = types.map{|type| File.join(path, "*.#{type}") }
+      Dir.glob(glob_list)
+    end
+
   end
 end

data/spec/logaling/command_spec.rb

@@ -4,27 +4,176 @@ 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(:project) { "spec" }
-  let(:glossary_path) { Logaling::Glossary.build_path(project, 'en', 'ja') }
+  let(:glossary_path) { Logaling::Glossary.build_path('spec', 'en', 'ja') }
+  let(:target_project_path) { File.join(LOGALING_HOME, "projects", "spec") }
 
-  before do
-    FileUtils.remove_entry_secure(File.join(LOGALING_HOME, 'projects', 'spec'), true)
-    FileUtils.mkdir_p(File.dirname(glossary_path))
+  describe '#new' do
+    before do
+      FileUtils.remove_entry_secure(Logaling::Command::LOGALING_CONFIG, true)
+      FileUtils.remove_file(target_project_path) if File.exist?(target_project_path)
+      @project_counts = Dir[File.join(LOGALING_HOME, "projects", "*")].size
+    end
+
+    context 'when .logaling already exists' do
+      before do
+        FileUtils.mkdir_p(Logaling::Command::LOGALING_CONFIG)
+        @stdout = capture(:stdout) { command.new('spec', 'en', 'ja') }
+      end
+
+      it 'print message \"<.logaling path> already exists.\"' do
+        @stdout.should == "#{Logaling::Command::LOGALING_CONFIG} already exists.\n"
+      end
+    end
+
+    context 'when .logaling does not exist' do
+      context 'and called with no special option' do
+        before do
+          command.new('spec', 'en', 'ja')
+        end
+
+        it 'should create .logaling' do
+          File.exist?(Logaling::Command::LOGALING_CONFIG).should be_true
+        end
+
+        it 'should register .logaling as project' do
+          File.exist?(target_project_path).should be_true
+          Dir[File.join(LOGALING_HOME, "projects", "*")].size.should == @project_counts + 1
+        end
+      end
+
+      context "and called with '--no-register=true'" do
+        before do
+          command.options = base_options.merge("no-register" => true)
+          command.new('spec', 'en', 'ja')
+        end
+
+        it 'should create .logaling' do
+          File.exist?(Logaling::Command::LOGALING_CONFIG).should be_true
+        end
+
+        it 'should not register .logaling as project' do
+          File.exist?(target_project_path).should be_false
+          Dir[File.join(LOGALING_HOME, "projects", "*")].size.should == @project_counts
+        end
+      end
+    end
+  end
+
+  describe '#register' do
+    before do
+      FileUtils.remove_file(target_project_path) if File.exist?(target_project_path)
+      @project_counts = Dir[File.join(LOGALING_HOME, "projects", "*")].size
+    end
+
+    context "when can not find .logaling" do
+      before(:all) do
+        FileUtils.remove_entry_secure(Logaling::Command::LOGALING_CONFIG, true)
+        @stdout = capture(:stdout) {command.register}
+      end
+
+      it 'register nothing' do
+        Dir[File.join(LOGALING_HOME, "projects", "*")].size.should == @project_counts
+      end
+
+      it "print message \"Try 'loga new' first.\"" do
+        @stdout.should == "Try 'loga new' first.\n"
+      end
+    end
+
+    context 'when find .logaling' do
+      before do
+        command.new('spec', 'en', 'ja')
+        command.register
+      end
+
+      it 'register .logaling as project' do
+        File.exist?(target_project_path).should be_true
+        Dir[File.join(LOGALING_HOME, "projects", "*")].size.should == @project_counts + 1
+      end
+
+      after do
+        FileUtils.remove_entry_secure(Logaling::Command::LOGALING_CONFIG, true)
+      end
+    end
+  end
+
+  describe '#unregister' do
+    before do
+      @project_counts = Dir[File.join(LOGALING_HOME, "projects", "*")].size
+    end
+
+    context "when can not find .logaling" do
+      before(:all) do
+        FileUtils.remove_entry_secure(Logaling::Command::LOGALING_CONFIG, true)
+        @stdout = capture(:stdout) {command.unregister}
+      end
+
+      it 'unregister nothing' do
+        Dir[File.join(LOGALING_HOME, "projects", "*")].size.should == @project_counts
+      end
+
+      it "print message \".logaling can't be found.\"" do
+        @stdout.should == ".logaling can't be found.\n"
+      end
+    end
+
+    context 'when find .logaling' do
+      before do
+        command.new('spec', 'en', 'ja')
+      end
+
+      context 'and .logaling registered' do
+        before do
+          command.register
+          command.unregister
+        end
+
+        it 'unregister .logaling' do
+          File.exist?(target_project_path).should be_false
+          Dir[File.join(LOGALING_HOME, "projects", "*")].size.should == @project_counts
+        end
+      end
+
+      context "and .logaling is not registered" do
+        before do
+          @stdout = capture(:stdout) {command.unregister}
+        end
+
+        it "print message \".logaling is not yet registered.\"" do
+          @stdout.should == ".logaling is not yet registered.\n"
+        end
+      end
+    end
   end
 
   describe '#create' do
     before do
-      FileUtils.touch(glossary_path)
+      FileUtils.remove_entry_secure(File.join(LOGALING_HOME, 'projects', 'spec'), true)
     end
 
     context 'with arguments show non-existent glossary' do
+      before do
+        command.new('spec', 'en', 'ja')
+        command.register
+        command.create
+      end
+
       it "glossary yaml should be newly created" do
         File.exists?(glossary_path).should be_true
       end
     end
+
+    after do
+      FileUtils.remove_entry_secure(Logaling::Command::LOGALING_CONFIG, true)
+    end
   end
 
   describe '#add' do
+    before do
+      FileUtils.remove_entry_secure(File.join(LOGALING_HOME, 'projects', 'spec'), true)
+      FileUtils.mkdir_p(File.dirname(glossary_path))
+    end
+
     context 'with arguments have only bilingual pair' do
       before do
         command.add("spec", "テスト")
@@ -60,6 +209,8 @@ describe Logaling::Command do
 
   describe "#update" do
     before do
+      FileUtils.remove_entry_secure(File.join(LOGALING_HOME, 'projects', 'spec'), true)
+      FileUtils.mkdir_p(File.dirname(glossary_path))
       command.add("spec", "テスト", "備考")
     end
 
@@ -94,6 +245,8 @@ describe Logaling::Command do
 
   describe '#index' do
     before do
+      FileUtils.remove_entry_secure(File.join(LOGALING_HOME, 'projects', 'spec'), true)
+      FileUtils.mkdir_p(File.dirname(glossary_path))
       command.add("spec", "スペック", "備考")
       command.index
     end
@@ -113,8 +266,12 @@ describe Logaling::Command do
   describe '#lookup' do
     let(:base_options2) { {"glossary"=>"spec2", "source-language"=>"en", "target-language"=>"ja"} }
     let(:command2) { Logaling::Command.new([], base_options2) }
-    let(:project2) { "spec2" }
-    let(:glossary_path2) { Logaling::Glossary.build_path(project2, 'en', 'ja') }
+    let(:glossary_path2) { Logaling::Glossary.build_path('spec2', 'en', 'ja') }
+
+    before do
+      FileUtils.remove_entry_secure(File.join(LOGALING_HOME, 'projects', 'spec'), true)
+      FileUtils.mkdir_p(File.dirname(glossary_path))
+    end
 
     context 'with arguments exist term' do
       before do

data/spec/logaling/glossary_db_spec.rb

@@ -12,34 +12,6 @@ describe Logaling::GlossaryDB do
     FileUtils.mkdir_p(File.dirname(glossary_path))
   end
 
-  describe '#get_file_list' do
-    context 'when specified file not exist' do
-      subject { glossary_db.get_file_list(File.dirname(glossary_path), ['yml', 'csv', 'tsv']) }
-      it 'should return empty array' do
-        should == []
-      end
-    end
-
-    context 'when specified file exists' do
-      before do
-        FileUtils.touch(glossary_path)
-        FileUtils.touch(tsv_path)
-        FileUtils.touch(csv_path)
-      end
-
-      subject { glossary_db.get_file_list(File.dirname(glossary_path), ['yml', 'csv', 'tsv']) }
-      it 'should return file list' do
-        should == [glossary_path, csv_path, tsv_path]
-      end
-
-      after do
-        FileUtils.remove_entry_secure(glossary_path, true)
-        FileUtils.remove_entry_secure(tsv_path, true)
-        FileUtils.remove_entry_secure(csv_path, true)
-      end
-    end
-  end
-
   describe '#load_glossary' do
     context 'with argument yml' do
       before do

data/spec/logaling/glossary_spec.rb

@@ -191,7 +191,7 @@ lookup word : user
         subject { logaling_db.open(db_home, "utf8"){|db| logaling_db.lookup("spec")} }
 
         it 'glossaries should be indexed' do
-          subject.should == [{:name=>"spec", :source_language=>"en", :target_language=>"ja", :source_term=>"spec", :target_term=>"スペック", :note=>"備考"}]
+          should == [{:name=>"spec", :source_language=>"en", :target_language=>"ja", :source_term=>"spec", :target_term=>"スペック", :note=>"備考"}]
         end
 
         after do
@@ -210,7 +210,7 @@ lookup word : user
         subject { logaling_db.open(db_home, "utf8"){|db| logaling_db.lookup("user")} }
 
         it 'glossaries should be indexed' do
-          subject.should == [{:name=>"spec", :source_language=>"en", :target_language=>"ja", :source_term=>"user", :target_term=>"ユーザ", :note=>nil}]
+          should == [{:name=>"spec", :source_language=>"en", :target_language=>"ja", :source_term=>"user", :target_term=>"ユーザ", :note=>nil}]
         end
 
         after do
@@ -229,7 +229,7 @@ lookup word : user
         subject { logaling_db.open(db_home, "utf8"){|db| logaling_db.lookup("test")} }
 
         it 'glossaries should be indexed' do
-          subject.should == [{:name=>"spec", :source_language=>"en", :target_language=>"ja", :source_term=>"test", :target_term=>"テスト", :note=>nil}]
+          should == [{:name=>"spec", :source_language=>"en", :target_language=>"ja", :source_term=>"test", :target_term=>"テスト", :note=>nil}]
         end
 
         after do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logaling-command
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,11 +13,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-22 00:00:00.000000000Z
+date: 2011-11-28 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2154516840 !ruby/object:Gem::Requirement
+  requirement: &2152368760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -25,10 +25,10 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *2154516840
+  version_requirements: *2152368760
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2154515940 !ruby/object:Gem::Requirement
+  requirement: &2152368000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -36,10 +36,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154515940
+  version_requirements: *2152368000
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2154515340 !ruby/object:Gem::Requirement
+  requirement: &2152367420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -47,10 +47,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154515340
+  version_requirements: *2152367420
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2154514760 !ruby/object:Gem::Requirement
+  requirement: &2152366640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -58,7 +58,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154514760
+  version_requirements: *2152366640
 description: A command line interface for logaling.
 email:
 - koji.shimada@enishi-tech.com