i18n-tasks 0.8.4 → 0.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6927148f79d82a7dfc85f9ed1551c65ab5534e34
-  data.tar.gz: 16af9b34933d2e3101c55e8c0edd0da014faa286
+  metadata.gz: 82cf5495a5f1756309ed77f51f8425c0b0c6d86e
+  data.tar.gz: 5169466a107b4260ee26d43e6f25126d3a9a88b0
 SHA512:
-  metadata.gz: 2fac88101d8d8087cf436299a25be28a56e70305f28b2c15c43d0888e1b3da34bb6ca23683d7dca216ecc27b7fa32324645882a77ee87b76c7dc7ead85e81b87
-  data.tar.gz: 4692ca4f35efcce3f1069f6d6068c4db6e492f99be500f57c4c88bf2bdf57d31ca7215edc23f8cdc5d16e3213c4c1ff3fded90378cf71a653638253cc368c11d
+  metadata.gz: 8c80cedb3419bf2b25b4de1331ad74be439db29f93526f7f9e66a853b873e8e331357b64f55ffb9a9fed987f01648a8baa39cfd9cb22ee7d7f1c35d2cdf72ac3
+  data.tar.gz: b9894a72294a25dd552d2ad5dcd44df63687df41a2c22ae067ab1f0f0927abc8d60f9bdba623079a654b1c2f3b4baf1182973c47c7db84627cbcdf2147b047bd

data/CHANGES.md

@@ -1,3 +1,7 @@
+## 0.8.5
+
+* Fix regression: Plugin support [#153](https://github.com/glebm/i18n-tasks/issues/153).
+
 ## 0.8.4
 
 * Support relative keys in mailers [#155](https://github.com/glebm/i18n-tasks/issues/155).

data/Rakefile

@@ -7,5 +7,5 @@ task :irb do
   # $: << File.expand_path('lib', __FILE__)
   require 'i18n/tasks'
   require 'i18n/tasks/commands'
-  ::I18n::Tasks::Commands.new.irb
+  ::I18n::Tasks::Commands.new(::I18n::Tasks::BaseTask.new).irb
 end

data/i18n-tasks.gemspec

@@ -37,7 +37,7 @@ TEXT
   s.add_dependency 'activesupport'
   s.add_dependency 'easy_translate', '>= 0.5.0'
   s.add_dependency 'term-ansicolor'
-  s.add_dependency 'terminal-table', '~> 1.4.5'
+  s.add_dependency 'terminal-table', '>= 1.5.1'
   s.add_dependency 'highline'
   s.add_dependency 'i18n'
   s.add_development_dependency 'axlsx', '~> 2.0'

data/lib/i18n/tasks/cli.rb

@@ -40,10 +40,12 @@ class I18n::Tasks::CLI
   end
 
   def context
-    @context ||= ::I18n::Tasks::Commands.new.tap(&:set_internal_locale!)
+    @context ||= ::I18n::Tasks::Commands.new(base_task).tap(&:set_internal_locale!)
   end
 
   def commands
+    # load base task to initialize plugins
+    base_task
     @commands ||= ::I18n::Tasks::Commands.cmds.dup.tap do |cmds|
       # Hash#transform_keys is only available since activesupport v4.0.0
       cmds.keys.each { |k| cmds[k.to_s.tr('_', '-')] = cmds.delete(k) }
@@ -52,6 +54,10 @@ class I18n::Tasks::CLI
 
   private
 
+  def base_task
+    @base_task ||= I18n::Tasks::BaseTask.new
+  end
+
   def parse!(argv)
     command = parse_command! argv
     options = optparse! command, argv

data/lib/i18n/tasks/command/commander.rb

@@ -8,7 +8,11 @@ module I18n::Tasks
     class Commander
       include ::I18n::Tasks::Logging
 
-      def initialize(i18n = nil)
+      attr_reader :i18n
+
+
+      # @param [I18n::Tasks::BaseTask] i18n
+      def initialize(i18n)
         @i18n = i18n
       end
 
@@ -37,10 +41,6 @@ module I18n::Tasks
         @spreadsheet_report ||= I18n::Tasks::Reports::Spreadsheet.new(i18n)
       end
 
-      def i18n
-        @i18n ||= I18n::Tasks::BaseTask.new
-      end
-
       delegate :base_locale, :locales, :t, to: :i18n
     end
   end

data/lib/i18n/tasks/version.rb

@@ -1,6 +1,6 @@
 # coding: utf-8
 module I18n
   module Tasks
-    VERSION = '0.8.4'
+    VERSION = '0.8.5'
   end
 end

data/spec/fixtures/config/i18n-tasks.yml

@@ -1,3 +1,6 @@
+<% require './lib/test_i18n_plugin'
+   ::I18n::Tasks::Commands.send :include, TestI18nPlugin %>
+
 base_locale: en
 locales: [es]
 

data/spec/fixtures/lib/test_i18n_plugin.rb

@@ -0,0 +1,12 @@
+# An i18n-tasks plugin to test that the plugin system works.
+module TestI18nPlugin
+  include ::I18n::Tasks::Command::Collection
+
+  cmd :greet,
+      desc: 'print "Hello, %{name}"',
+      args: [['-n', '--name NAME', 'name']]
+
+  def greet(opts = {})
+    puts "Hello, #{opts[:name]}"
+  end
+end

data/spec/i18n_tasks_spec.rb

@@ -10,18 +10,22 @@ describe 'i18n-tasks' do
   describe 'bin/i18n-tasks' do
     it 'shows help when invoked with no arguments, shows version on --version' do
       # These bin/i18n-tasks tests are executed in parallel for performance
-      [
-          proc {
-            out, err, status = Open3.capture3('bin/i18n-tasks')
-            expect(status).to be_success
-            expect(out).to be_empty
-            expect(err).to start_with('Usage: i18n-tasks [command] [options]')
-            expect(err).to include('Available commands', 'add-missing')
-          },
-          proc {
-            expect(%x[bin/i18n-tasks --version].chomp).to eq(I18n::Tasks::VERSION)
-          }
-      ].map { |test| Thread.start(&test) }.each(&:join)
+      in_test_app_dir do
+        [
+            proc {
+              out, err, status = Open3.capture3('../../bin/i18n-tasks')
+              expect(status).to be_success
+              expect(out).to be_empty
+              expect(err).to start_with('Usage: i18n-tasks [command] [options]')
+              expect(err).to include('Available commands', 'add-missing')
+              # a task from a plugin
+              expect(err).to include('greet')
+            },
+            proc {
+              expect(%x[../../bin/i18n-tasks --version].chomp).to eq(I18n::Tasks::VERSION)
+            }
+        ].map { |test| Thread.start(&test) }.each(&:join)
+      end
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n-tasks
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.5
 platform: ruby
 authors:
 - glebm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-27 00:00:00.000000000 Z
+date: 2015-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis
@@ -70,16 +70,16 @@ dependencies:
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.5
+        version: 1.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.5
+        version: 1.5.1
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -270,6 +270,7 @@ files:
 - spec/fixtures/app/views/relative/index.html.slim
 - spec/fixtures/app/views/usages.html.slim
 - spec/fixtures/config/i18n-tasks.yml
+- spec/fixtures/lib/test_i18n_plugin.rb
 - spec/google_translate_spec.rb
 - spec/i18n_spec.rb
 - spec/i18n_tasks_spec.rb
@@ -316,7 +317,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Manage localization and translation with the awesome power of static analysis
@@ -331,6 +332,7 @@ test_files:
 - spec/fixtures/app/views/relative/index.html.slim
 - spec/fixtures/app/views/usages.html.slim
 - spec/fixtures/config/i18n-tasks.yml
+- spec/fixtures/lib/test_i18n_plugin.rb
 - spec/google_translate_spec.rb
 - spec/i18n_spec.rb
 - spec/i18n_tasks_spec.rb