konjac 0.2.7 → 0.2.8

data/README.rdoc

@@ -158,6 +158,11 @@ Should be simple enough to generate yourself:
     mv doc/rdoc/* .
     rm -rf doc
 
+== Supplementary Stuff
+
+{Vim integration}[https://github.com/brymck/konjac_vim]
+{My dictionaries}[https://github.com/brymck/konjac_yml]
+
 == Name
 
 <em>Hon'yaku</em> means "translation" in Japanese. This utility relies on a

data/konjac.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
   s.require_paths    = ["lib"]
 
   s.add_runtime_dependency "amatch"
+  s.add_runtime_dependency "git"
   s.add_runtime_dependency "highline"
   s.add_runtime_dependency "i18n"
   s.add_runtime_dependency "nokogiri"

data/lib/bash/install_vim

@@ -0,0 +1,5 @@
+#!/bin/bash
+cd ~/.vim
+git submodule add git://github.com/brymck/konjac_vim.git bundle/konjac_vim
+git submodule init
+git submodule update

data/lib/bash/update_vim

@@ -0,0 +1,3 @@
+#!/bin/bash
+cd ~/.vim/bundle/konjac_vim
+git pull origin master

data/lib/konjac/cli.rb

@@ -12,8 +12,8 @@ module Konjac
 
     class << self
       # A list of valid subcommands
-      SUB_COMMANDS = ["add", "export", "import", "language", "list", "suggest",
-        "translate", "use"]
+      SUB_COMMANDS = ["add", "export", "import", "install", "language", "list",
+        "suggest", "translate", "update", "use"]
 
       # The minimum amount by which to offset subcommands in standard display.
       # Should be equal to the length of the longest top-level flag (e.g. the
@@ -88,6 +88,17 @@ eos
               opt :help, I18n.t(:help, :scope => :opts)
             end
             Office.import_tags ARGV, opts
+          when "install"
+            Trollop::options do
+              banner sc_banner % I18n.t(:word_arg)
+              opt :help, I18n.t(:help, :scope => :opts)
+            end
+            case ARGV[0]
+            when "dictionaries", "dict", "dictionary"
+              Installer.install_dictionaries
+            when "vim"
+              Installer.install_vim
+            end
           when "language"
             Trollop::options do
               banner sc_banner % I18n.t(:word_arg)
@@ -135,6 +146,17 @@ eos
             end
             result = translate(ARGV, opts)
             puts result if opts[:word]
+          when "update"
+            Trollop::options do
+              banner sc_banner % I18n.t(:word_arg)
+              opt :help, I18n.t(:help, :scope => :opts)
+            end
+            case ARGV[0]
+            when "dictionaries", "dict", "dictionary"
+              Installer.update_dictionaries
+            when "vim"
+              Installer.update_vim
+            end
           when "use"
             Trollop::options do
               banner sc_banner % I18n.t(:word_arg)

data/lib/konjac/installer.rb

@@ -0,0 +1,102 @@
+# coding: utf-8
+module Konjac
+  # A class to help with installing supplementary tools for Konjac
+  module Installer
+    VIM_GIT = "git://github.com/brymck/konjac_vim.git"
+    YML_GIT = "git://github.com/brymck/konjac_yml.git"
+
+    class << self
+      # Install the supplementary {Vim plugin}[https://github.com/brymck/konjac_vim]
+      def install_vim
+        if has_pathogen?
+          return update_vim if vim_installed?
+
+          system File.join(File.dirname(__FILE__), "..", "bash", "install_vim")
+        else
+          dir = Dir.mktmpdir
+          begin
+          ensure
+            FileUtils.remove_entry_secure dir
+          end
+        end
+      end
+
+      # Install the supplementary {dictionaries}[https://github.com/brymck/konjac_yml]
+      def install_dictionaries
+        if dictionaries_installed?
+          update_dictionaries
+        else
+          Dir.chdir(konjac_home) do
+            g = Git.clone(YML_GIT, ".dictionaries", :name => ".dictionaries",
+              :path => konjac_home)
+            g.chdir do
+              FileUtils.cp_r Dir.glob("*.yml"), konjac_home
+            end
+          end
+        end
+      end
+
+      # Update the supplementary {Vim plugin}[https://github.com/brymck/konjac_vim]
+      def update_vim
+        if has_pathogen? && vim_installed?
+          system File.join(File.dirname(__FILE__), "..", "bash", "update_vim")
+        else
+          install_vim
+        end
+      end
+
+      # Update the supplementary {dictionaries}[https://github.com/brymck/konjac_yml]
+      def update_dictionaries
+        if dictionaries_installed?
+          g = Git.open(File.join(konjac_home, ".dictionaries"))
+          g.pull
+          g.chdir do
+            FileUtils.cp_r Dir.glob("*.yml"), konjac_home
+          end
+        else
+          install_dictionaries
+        end
+      end
+
+      # Update everything
+      def update
+        update_dictionaries
+        update_vim
+      end
+
+      private
+
+      # Determines the location of Vim's home directory. This is currently
+      # pretty naïve, but I'll build in functionality later to allow for
+      # customized home directories.
+      def vim_home
+        @vim_home ||= File.join(File.expand_path(Dir.home),
+                        RUBY_PLATFORM =~ /mswin32/ ? "vimfiles" : ".vim")
+      end
+
+      # The path for Konjac's configuration and dictionary files
+      def konjac_home
+        @konjac_home ||= File.join(File.expand_path(Dir.home), ".konjac")
+      end
+
+      # Whether the user has {Pathogen}[http://www.vim.org/scripts/script.php?script_id=2332]
+      def has_pathogen?
+        File.exists? File.join(vim_home, "autoload", "pathogen.vim")
+      end
+
+      # Whether the user has the Vim plugin installed
+      def vim_installed?
+        if has_pathogen?
+          File.exist? File.join(vim_home, "bundle", "konjac_vim")
+        else
+          File.exist? File.join(vim_home, "plugin", "konjac.vim")
+        end
+      end
+
+      # Whether the user has the supplementary dictionaries installed
+      def dictionaries_installed?
+        File.exist? File.join(konjac_home, ".dictionaries", ".git")
+      end
+    end
+  end
+end

data/lib/konjac/version.rb

@@ -1,4 +1,4 @@
 module Konjac
   # The current version number of Konjac
-  VERSION = "0.2.7"
+  VERSION = "0.2.8"
 end

data/lib/konjac.rb

@@ -2,6 +2,7 @@ require "konjac/version"
 require "konjac/exception"
 autoload :Amatch,    "amatch"
 autoload :FileUtils, "fileutils"
+autoload :Git,       "git"
 autoload :HighLine,  "highline/system_extensions"
 autoload :I18n,      "i18n"
 autoload :Nokogiri,  "nokogiri"
@@ -14,6 +15,7 @@ module Konjac
   autoload :CLI,        "konjac/cli"
   autoload :Config,     "konjac/config"
   autoload :Dictionary, "konjac/dictionary"
+  autoload :Installer,  "konjac/installer"
   autoload :Language,   "konjac/language"
   autoload :Office,     "konjac/office"
   autoload :Suggestor,  "konjac/suggestor"

data/lib/locales/en.yml

@@ -18,12 +18,14 @@ en:
     force: Automatically overwrite files
     from: The language from which to translate
     help: Show this message
+    install: Install supplementary scripts
     original: The untranslated original text
     output: The name of the output file
     prompt: Prompt before overwriting a file
     quiet: Suppress error messages
     to: The language into which to translate
     translation: The translated text
+    update: Update supplementary scripts
     using: The names of dictionaries to use
     use_cache: Use cached dictionary
     version: Print version and exit

data/lib/locales/ja.yml

@@ -18,12 +18,14 @@ ja:
     force: 自動にファイルを上書きする
     from: ソース言語
     help: このメッセージを表示する
+    install: スクリプトなどをインストールする
     original: ソーステキスト
     output: 出力ファイル名
     prompt: ファイルをする場合に警告する
     quiet: エラーメッセージを抑止する
     to: ターゲット言語
     translation: ターゲットテキスト
+    update: スクリプトなどをアップデートする
     using: 使用したい辞書の名前
     use_cache: キャッシュした翻訳メモリを適用する
     version: バーションを表示し終了する

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: konjac
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-27 00:00:00.000000000 Z
+date: 2012-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amatch
-  requirement: &70314005857720 !ruby/object:Gem::Requirement
+  requirement: &70315284595940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70314005857720
+  version_requirements: *70315284595940
+- !ruby/object:Gem::Dependency
+  name: git
+  requirement: &70315284623080 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70315284623080
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70314005857300 !ruby/object:Gem::Requirement
+  requirement: &70315284622660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70314005857300
+  version_requirements: *70315284622660
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70314005856880 !ruby/object:Gem::Requirement
+  requirement: &70315284622240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70314005856880
+  version_requirements: *70315284622240
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70314005856440 !ruby/object:Gem::Requirement
+  requirement: &70315284621820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70314005856440
+  version_requirements: *70315284621820
 - !ruby/object:Gem::Dependency
   name: sdoc
-  requirement: &70314005856000 !ruby/object:Gem::Requirement
+  requirement: &70315284621380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70314005856000
+  version_requirements: *70315284621380
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &70314005855580 !ruby/object:Gem::Requirement
+  requirement: &70315284620960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70314005855580
+  version_requirements: *70315284620960
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70314005855160 !ruby/object:Gem::Requirement
+  requirement: &70315284620540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70314005855160
+  version_requirements: *70315284620540
 - !ruby/object:Gem::Dependency
   name: autotest
-  requirement: &70314005854740 !ruby/object:Gem::Requirement
+  requirement: &70315284620120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70314005854740
+  version_requirements: *70315284620120
 - !ruby/object:Gem::Dependency
   name: autotest-fsevent
-  requirement: &70314005854320 !ruby/object:Gem::Requirement
+  requirement: &70315284619700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70314005854320
+  version_requirements: *70315284619700
 - !ruby/object:Gem::Dependency
   name: autotest-growl
-  requirement: &70314005853900 !ruby/object:Gem::Requirement
+  requirement: &70315284619260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70314005853900
+  version_requirements: *70315284619260
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70314005853480 !ruby/object:Gem::Requirement
+  requirement: &70315284618760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70314005853480
+  version_requirements: *70315284618760
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70314005853060 !ruby/object:Gem::Requirement
+  requirement: &70315284618240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,7 +153,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70314005853060
+  version_requirements: *70315284618240
 description: A Ruby command-line utility for translating files using a YAML wordlist
 email:
 - bryan.mckelvey@gmail.com
@@ -165,11 +176,14 @@ files:
 - lib/applescripts/konjac_powerpoint_import
 - lib/applescripts/konjac_word_export
 - lib/applescripts/konjac_word_import
+- lib/bash/install_vim
+- lib/bash/update_vim
 - lib/konjac.rb
 - lib/konjac/cli.rb
 - lib/konjac/config.rb
 - lib/konjac/dictionary.rb
 - lib/konjac/exception.rb
+- lib/konjac/installer.rb
 - lib/konjac/language.rb
 - lib/konjac/office.rb
 - lib/konjac/suggestor.rb