haml-i18n-extractor 0.0.21 → 0.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTUxZGE3Mzk4ZWNhNTQ1NmI2ZmYzOGFkNTc0ZDYxMTM3Y2U3NDY3Mw==
+    MjgwZDJiZjM2NDdkYmUwZDNlODFmNmY4NWYwZWYzMmVjNGM0YjVmMA==
   data.tar.gz: !binary |-
-    ZTA1MDJlOWZiZmZjZWFkNTFiZmFjOWE3MWI2YzM4ZGIzZmYzZjA4YQ==
+    NjZhOTA5YTVmMDE2YmQxMzcyNmUxMDk3NzFkODNkN2FmMWY5MGM1OQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YjJiYzFhZWNiZjhkODQxYTU3YTQ3MzhmYjJiY2I4MDA1ZmJjNzJmNTVhMDZi
-    ZGY3ODJlMDc1ZThmM2M1NDJlZWExODZlMzg2YThmMDM2Y2VmZDQ0ZGJlMTU1
-    NmYxNWIyNjgyNzJlNzA3N2JmYTJlMDYzZTE5MDYyNDVlMzQwMmE=
+    YzU2NTgwNDVlMTE5NDlkMzFhMmViNTYwY2FhZmFiNzJhNTVjNGIzNmM0MTli
+    NWZlYjc2ZDg5MTM2ZDU5NTEwNjQyZDdlNWRiYjIxMGZjNDIwYWMyNzk1MmRk
+    OGRiMmJmNmE3ZjcwNmM4YTA4ZDQ0ZmI2MWFlZjQ1NGExODhkN2Y=
   data.tar.gz: !binary |-
-    MWVhMGQ0ZmIzZTE5NGI3YWMwYjk4YzFmYzQ1OTdmNjBiNjg5NGU4ZDI5Yjkw
-    OGY3ODA2ZWFkNTYzM2ZhYTJkNzg2MDYyZjFlMjJhNGM4Njk4NTQyZGVmNDU3
-    ZjE4MWY3NjA5YzJmMDRmNzZiODllYTA1MjI5YTcwNDdjNmUxM2E=
+    YWRmZjIwNzUyZWM1ODhmYWQ0N2Q3ODk3MmYxZGE0NjBiNmQ5ODI3MmUyYzgz
+    Y2NjZTE3MzI5ZjU1YjU1NjQ3YjgyZTM5M2NmNTRmMDgzNzhiNGNjOTM5MjRk
+    MzE0OWE5YjVhMTNkMjNlNzU5ZDQ0MzFhZDI4N2NjMDljMjZjMDI=

data/TODO

@@ -11,6 +11,7 @@
 * Issues
 
 - CLI options: Extractor.new accepts options. pass through workflow. First up: i18n_scope (issue#5)
+- add a ~/.haml-i18n-extractor file/dir/config file etc. to keep preferences of interactive mode or not?
 
  * Ideas
 

data/bin/haml-i18n-extractor

@@ -2,27 +2,22 @@
 
 require 'haml-i18n-extractor'
 
-if ARGV.empty?
-  puts "Usage: <haml-i18n-extractor> --version"
-  puts "Usage: <haml-i18n-extractor> [path]"
-  puts "Usage: <haml-i18n-extractor> [filename] --no-prompt"
-  abort
-end
+@prompter = Haml::I18n::Extractor::Prompter.new
 
-if ARGV[0] == "--version"
-  puts Haml::I18n::Extractor::VERSION
-  abort
+option_parser = Trollop::Parser.new do
+  version "Current version: #{Haml::I18n::Extractor::VERSION}"
+  opt :interactive, "interactive mode", :short => 'i'
+  opt :non_interactive, "non interactive mode", :short => 'n'
+  opt :path, "path", :type => String
 end
 
-pth = File.expand_path(ARGV[0])
+opts = Trollop::with_standard_exception_handling option_parser do
+  raise Trollop::HelpNeeded if ARGV.empty?
+  option_parser.parse ARGV
+end
 
-if File.directory?(pth)
-  workflow = Haml::I18n::Extractor::Workflow.new(pth)
-  workflow.run
-elsif File.exists?(pth) && ARGV[1] == "--no-prompt"
-  extractor = Haml::I18n::Extractor.new(pth, :type => :overwrite, :prompt_per_line => false)
-  extractor.run
-elsif File.exists?(pth)
-  extractor = Haml::I18n::Extractor.new(pth, :type => :overwrite, :prompt_per_line => true)
-  extractor.run
+begin
+  Haml::I18n::Extractor::CLI.new(opts).start
+rescue  Haml::I18n::Extractor::CLI::CliError
+  @prompter.puts("please try again")
 end

data/haml-i18n-extractor.gemspec

@@ -21,8 +21,10 @@ Gem::Specification.new do |gem|
   gem.add_dependency "haml"
   gem.add_dependency "activesupport"
   gem.add_dependency "highline"
+  gem.add_dependency "trollop", "1.16.2"
 
   gem.add_development_dependency 'rbench'
+  gem.add_development_dependency 'm'
   gem.add_development_dependency 'pry'
   gem.add_development_dependency 'minitest'
   gem.add_development_dependency 'nokogiri'

data/lib/haml-i18n-extractor/cli.rb

@@ -0,0 +1,40 @@
+class Haml::I18n::Extractor
+  class CLI
+
+    class CliError < StandardError; end
+
+    def initialize(opts)
+      @options = opts || {}
+      @prompter = Haml::I18n::Extractor::Prompter.new # may as well
+    end
+
+    def start
+      check_interactive_or_not_passed
+      if @options[:path]
+        check_interactive_or_not_passed
+        pth = File.expand_path(@options[:path])
+
+        if File.directory?(pth)
+          workflow = Haml::I18n::Extractor::Workflow.new(pth, @options)
+          workflow.run
+        elsif File.exists?(pth) && @options[:interactive]
+          extractor = Haml::I18n::Extractor.new(pth, :type => :overwrite, :interactive => true)
+          extractor.run
+        elsif File.exists?(pth) && @options[:non_interactive]
+          extractor = Haml::I18n::Extractor.new(pth, :type => :overwrite, :interactive => false)
+          extractor.run
+        end
+      end
+    end
+
+    private
+
+    def check_interactive_or_not_passed
+      if !@options[:interactive] && !@options[:non_interactive]
+        @prompter.puts("You must choose either one of interactive mode or non interactive mode.")
+        @prompter.puts("See haml-i18n-extractor --help")
+        raise CliError
+      end
+    end
+  end
+end

data/lib/haml-i18n-extractor/extractor.rb

@@ -20,8 +20,9 @@ module Haml
       DEFAULT_LINE_LOCALE_HASH = { :modified_line => nil,:keyname => nil,:replaced_text => nil, :path => nil }
 
       def initialize(haml_path, opts = {})
-        @type = opts[:type]
-        @prompt_per_line = opts[:prompt_per_line]
+        @options = opts
+        @type = @options[:type]
+        @interactive = @options[:interactive]
         @prompter = Haml::I18n::Extractor::Prompter.new
         @haml_reader = Haml::I18n::Extractor::HamlReader.new(haml_path)
         validate_haml(@haml_reader.body)
@@ -79,7 +80,7 @@ module Haml
 
         user_action = Haml::I18n::Extractor::UserAction.new('y') # default if no prompting: just do it.
         if should_be_replaced
-          if prompt_per_line?
+          if interactive?
             user_action = @prompter.ask_user(orig_line,text_to_replace)
           end
         end
@@ -100,8 +101,8 @@ module Haml
         return should_be_replaced
       end
 
-      def prompt_per_line?
-        !!@prompt_per_line
+      def interactive?
+        !!@interactive
       end
 
       private

data/lib/haml-i18n-extractor/prompter.rb

@@ -8,6 +8,10 @@ module Haml
 
         include Helpers::Highline
 
+        def puts(txt)
+          say(txt)
+        end
+
         def ask_user(orig_line, replaced_line)
           say(highlight("Replace this line:"))
           say("\n")

data/lib/haml-i18n-extractor/version.rb

@@ -1,7 +1,7 @@
 module Haml
   module I18n
     class Extractor
-      VERSION = "0.0.21"
+      VERSION = "0.1.0"
     end
   end
 end

data/lib/haml-i18n-extractor/workflow.rb

@@ -5,8 +5,9 @@ module Haml
 
         attr_reader :extractors
 
-        def initialize(project_path)
+        def initialize(project_path, options = {})
           @extractors = []
+          @passed_options = options
           @project_path = project_path
           @prompter = Haml::I18n::Extractor::Prompter.new
           unless File.directory?(@project_path)
@@ -14,6 +15,10 @@ module Haml
           end
         end
 
+        def interactive?
+          !!@passed_options[:interactive]
+        end
+
         def files
           @haml_files ||= Dir.glob(@project_path + "/**/*").select do |file|
            file.match /.haml$/
@@ -32,16 +37,22 @@ module Haml
         end
 
         def run
-          start_message
-          files.each do |haml_path|
-            type = process_file?(haml_path)
-            if type
-              process(haml_path, type)
-            else
-              @prompter.not_processing(haml_path)
+          if interactive?
+            start_message
+            files.each do |haml_path|
+              type = process_file?(haml_path)
+              if type
+                process(haml_path, type)
+              else
+                @prompter.not_processing(haml_path)
+              end
+            end
+            end_message
+          else
+            files.each do |haml_path|
+              process(haml_path, :overwrite)
             end
           end
-        end_message
         end
 
         private
@@ -57,7 +68,7 @@ module Haml
         def process(haml_path, type)
           @prompter.process(haml_path, type)
           options = {:type => type} # overwrite or dump haml
-          options.merge!({:prompt_per_line => true}) # per-line prompts
+          options.merge!({:interactive => @passed_options[:interactive]}) # per-line prompts
           begin
             @extractor = Haml::I18n::Extractor.new(haml_path, options)
             @extractors << @extractor

data/lib/haml-i18n-extractor.rb

@@ -10,3 +10,5 @@ require "haml-i18n-extractor/prompter"
 require "haml-i18n-extractor/user_action"
 require "haml-i18n-extractor/tagging_tool"
 require "haml-i18n-extractor/workflow"
+require "haml-i18n-extractor/cli"
+require "trollop"

data/test/cli_test.rb

@@ -0,0 +1,31 @@
+require 'test_helper'
+
+module Haml
+  class CLITest < MiniTest::Unit::TestCase
+
+    test "it needs an explicit interactive or non-interactive option" do
+      opts = {:non_interactive => nil, :interactive => nil}
+      with_highline do
+        begin
+          Haml::I18n::Extractor::CLI.new(opts).start
+        rescue Haml::I18n::Extractor::CLI::CliError
+          assert @output.string.match(/--help/), "passing interactive or not"
+        end
+      end
+    end
+
+    test "with a interactive option it needs a path" do
+      opts = {:non_interactive => nil, :path => nil}
+       with_highline do
+         begin
+           Haml::I18n::Extractor::CLI.new(opts).start
+         rescue Haml::I18n::Extractor::CLI::CliError
+           assert @output.string.match(/--help/), "passing interactive or not needs path"
+         end
+      end
+   end
+
+  end
+end
+
+

data/test/extractor_test.rb

@@ -18,15 +18,15 @@ module Haml
       assert_equal h.haml_writer.overwrite?, false
     end
 
-    test "with a prompt_per_line option which prompts the user-per line" do
-      h = Haml::I18n::Extractor.new(file_path("ex1.haml"), :prompt_per_line => true)
-      assert_equal h.prompt_per_line?, true
+    test "with a interactive option which prompts the user-per line" do
+      h = Haml::I18n::Extractor.new(file_path("ex1.haml"), :interactive => true)
+      assert_equal h.interactive?, true
       h = Haml::I18n::Extractor.new(file_path("ex1.haml"))
-      assert_equal h.prompt_per_line?, false
+      assert_equal h.interactive?, false
     end
 
-    test "with a prompt_per_line option takes user input into consideration for haml" do
-      h = Haml::I18n::Extractor.new(file_path("ex1.haml"), :prompt_per_line => true)
+    test "with a interactive option takes user input into consideration for haml" do
+      h = Haml::I18n::Extractor.new(file_path("ex1.haml"), :interactive => true)
       user_input = "D" # dump
       File.readlines(file_path("ex1.haml")).size.times do
         user_input << "n" # do not replace lines
@@ -38,8 +38,8 @@ module Haml
       assert_equal File.read(h.haml_writer.path), File.read(file_path("ex1.haml"))
     end
 
-    test "with a prompt_per_line option takes user input N as next and stops processing file" do
-      h = Haml::I18n::Extractor.new(file_path("ex1.haml"), :prompt_per_line => true)
+    test "with a interactive option takes user input N as next and stops processing file" do
+      h = Haml::I18n::Extractor.new(file_path("ex1.haml"), :interactive => true)
       user_input = "D" # dump
       File.readlines(file_path("ex1.haml")).size.times do
         user_input << "N" # just move on to next file
@@ -51,9 +51,9 @@ module Haml
       assert_equal File.read(h.haml_writer.path), File.read(file_path("ex1.haml"))
     end
 
-    test "with a prompt_per_line option takes user input into consideration for yaml" do
+    test "with a interactive option takes user input into consideration for yaml" do
       TestHelper.hax_shit
-      h = Haml::I18n::Extractor.new(file_path("ex1.haml"), :prompt_per_line => true)
+      h = Haml::I18n::Extractor.new(file_path("ex1.haml"), :interactive => true)
       user_input = "D" # dump
       File.readlines(file_path("ex1.haml")).size.times do
         user_input << "n" # do not replace lines
@@ -65,12 +65,12 @@ module Haml
       assert_equal YAML.load(File.read(h.yaml_tool.locale_file)), {}
     end
 
-    test "with a prompt_per_line option user can tag a line for later review" do
+    test "with a interactive option user can tag a line for later review" do
       TestHelper.hax_shit
       if File.exist?(Haml::I18n::Extractor::TaggingTool::DB)
         assert_equal File.readlines(Haml::I18n::Extractor::TaggingTool::DB), []
       end
-      h = Haml::I18n::Extractor.new(file_path("ex1.haml"), :prompt_per_line => true)
+      h = Haml::I18n::Extractor.new(file_path("ex1.haml"), :interactive => true)
       user_input = "D" # dump
       File.readlines(file_path("ex1.haml")).size.times do
         user_input << "t" # tag the lines

data/test/prompter_test.rb

@@ -4,19 +4,19 @@ module Haml
   # misnomer, this is also testing UserAction
   class PrompterAndUserActionTest < MiniTest::Unit::TestCase
 
-    def test_asks_to_process_line_yes
+    test "asks_to_process_line_yes" do
       with_highline("y") do
         assert_equal Haml::I18n::Extractor::Prompter.new.ask_user("orig", "replace").replace_line?, true
       end
     end
 
-    def test_asks_to_process_line_no
+    test "asks_to_process_line_no" do
       with_highline("n") do
         assert_equal Haml::I18n::Extractor::Prompter.new.ask_user("orig", "replace").no_replace?, true
       end
     end
 
-    def test_asks_to_process_line_tag
+    test "test_asks_to_process_line_tag" do
       with_highline("t") do
         assert_equal Haml::I18n::Extractor::Prompter.new.ask_user("orig", "replace").tag?, true
       end

data/test/workflow_test.rb

@@ -12,26 +12,28 @@ module Haml
       TestHelper.teardown_project_directory!
     end
 
-    def test_it_should_work_on_a_directory_mkay
-      filename = "#{TestHelper::PROJECT_DIR}app/views/bar/thang.haml"
-      bad_worfklow = Haml::I18n::Extractor::Workflow.new(filename)
-      assert false, "should raise"
-    rescue Haml::I18n::Extractor::NotADirectory
-      assert true, "workflow works on a directory bubba."
+    test "it_should_work_on_a_directory_mkay" do
+      begin
+        filename = "#{TestHelper::PROJECT_DIR}app/views/bar/thang.haml"
+        bad_worfklow = Haml::I18n::Extractor::Workflow.new(filename)
+        assert false, "should raise"
+      rescue Haml::I18n::Extractor::NotADirectory
+        assert true, "workflow works on a directory bubba."
+      end
     end
 
-    def test_it_finds_all_haml_files
+    test "it_finds_all_haml_files" do
       assert_equal @workflow.files.size, 6
     end
 
-    def test_outputs_stats
+    test "outputs_stats" do
       with_highline do
         @workflow.start_message
         assert @output.string.match(/Found 6 haml files/), "Outputs stats"
       end
     end
 
-    def test_yaml_file_in_config
+    test "yaml_file_in_config" do
       TestHelper.mock_full_project_user_interaction!
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: haml-i18n-extractor
 version: !ruby/object:Gem::Version
-  version: 0.0.21
+  version: 0.1.0
 platform: ruby
 authors:
 - Shai Rosenfeld
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-29 00:00:00.000000000 Z
+date: 2013-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
@@ -66,6 +66,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: trollop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.16.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.16.2
 - !ruby/object:Gem::Dependency
   name: rbench
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +94,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: m
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -184,6 +212,7 @@ files:
 - demo/haml-i18n-extractor-demo.swf
 - haml-i18n-extractor.gemspec
 - lib/haml-i18n-extractor.rb
+- lib/haml-i18n-extractor/cli.rb
 - lib/haml-i18n-extractor/core-ext/hash.rb
 - lib/haml-i18n-extractor/extractor.rb
 - lib/haml-i18n-extractor/haml_reader.rb
@@ -197,6 +226,7 @@ files:
 - lib/haml-i18n-extractor/version.rb
 - lib/haml-i18n-extractor/workflow.rb
 - lib/haml-i18n-extractor/yaml_tool.rb
+- test/cli_test.rb
 - test/extractor_test.rb
 - test/haml_reader_test.rb
 - test/haml_writer_test.rb
@@ -237,6 +267,7 @@ signing_key:
 specification_version: 4
 summary: Parse the texts out of the haml files into localization files
 test_files:
+- test/cli_test.rb
 - test/extractor_test.rb
 - test/haml_reader_test.rb
 - test/haml_writer_test.rb
@@ -253,3 +284,4 @@ test_files:
 - test/text_replacer_test.rb
 - test/workflow_test.rb
 - test/yaml_tool_test.rb
+has_rdoc: