locamotion 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ef4eaad16d81e361b14657ae0d470b49838fea4
-  data.tar.gz: 903eb278cff9b0f17ef395a93831089e1ff0807b
+  metadata.gz: a2921c947d31171a96954af1871352674b39f582
+  data.tar.gz: bfa8f67c27e54e70fe465a48cc997894f252dbc2
 SHA512:
-  metadata.gz: 73b10e4a3f9cdd2dda0eeb726d73c2ee7bb8dcc2c7aeac4ea96ab524fe58570b4807f881dffb987d76459dfdc2698e4a9c13e179b8325b4ce9070636b9975e19
-  data.tar.gz: 214db372cae9b7cde8a07c25ffcb49bab91c05e73fc2488ba031a1dcef346003ad4ede868423d9e6179860f60f3ab999458be73c506834e0e9a6259afd3177d0
+  metadata.gz: c664211a9fffc9f7bfbebe27f31592de0f3dc7f2443c29c62744343188c1417a7f19dc5d9412da6ec266871f8619adce6179f0c185c93783326abc84faa73d51
+  data.tar.gz: 65d7390b4d6ae4d5b44da190831905b7857fd978ab11c8d1d8d4bef457008282827dae70ee62cd7febdedbc5c3d8201ad5efc25b14483c0ff50c3c348644078d

data/Gemfile.lock

@@ -1,40 +1,47 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.3.6)
-    aruba (0.6.1)
-      childprocess (>= 0.3.6)
-      cucumber (>= 1.1.1)
-      rspec-expectations (>= 2.7.0)
+    addressable (2.4.0)
+    aruba (0.13.0)
+      childprocess (~> 0.5.6)
+      contracts (~> 0.9)
+      cucumber (>= 1.3.19)
+      ffi (~> 1.9.10)
+      rspec-expectations (>= 2.99)
+      thor (~> 0.19)
     builder (3.2.2)
-    childprocess (0.5.5)
+    childprocess (0.5.9)
       ffi (~> 1.0, >= 1.0.11)
-    cucumber (1.3.18)
+    contracts (0.13.0)
+    cucumber (2.3.2)
       builder (>= 2.1.2)
+      cucumber-core (~> 1.4.0)
+      cucumber-wire (~> 0.0.1)
       diff-lcs (>= 1.1.3)
-      gherkin (~> 2.12)
+      gherkin (~> 3.2.0)
       multi_json (>= 1.7.5, < 2.0)
-      multi_test (>= 0.1.1)
+      multi_test (>= 0.1.2)
+    cucumber-core (1.4.0)
+      gherkin (~> 3.2.0)
+    cucumber-wire (0.0.1)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.2.5)
     docile (1.1.5)
-    faraday (0.9.0)
+    faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    ffi (1.9.6)
-    gherkin (2.12.2)
-      multi_json (~> 1.3)
-    git (1.2.8)
-    github_api (0.12.2)
-      addressable (~> 2.3)
+    ffi (1.9.10)
+    gherkin (3.2.0)
+    git (1.3.0)
+    github_api (0.13.1)
+      addressable (~> 2.4.0)
       descendants_tracker (~> 0.0.4)
       faraday (~> 0.8, < 0.10)
-      hashie (>= 3.3)
+      hashie (>= 3.4)
       multi_json (>= 1.7.5, < 2.0)
-      nokogiri (~> 1.6.3)
       oauth2
-    hashie (3.3.2)
-    highline (1.6.21)
+    hashie (3.4.3)
+    highline (1.7.8)
     jeweler (2.0.1)
       builder
       bundler (>= 1.0)
@@ -44,23 +51,23 @@ GEM
       nokogiri (>= 1.5.10)
       rake
       rdoc
-    json (1.8.1)
-    jwt (1.2.0)
-    mini_portile (0.6.2)
-    multi_json (1.10.1)
-    multi_test (0.1.1)
+    json (1.8.3)
+    jwt (1.5.1)
+    mini_portile2 (2.0.0)
+    multi_json (1.11.2)
+    multi_test (0.1.2)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
-    nokogiri (1.6.5)
-      mini_portile (~> 0.6.0)
-    oauth2 (1.0.0)
+    nokogiri (1.6.7.2)
+      mini_portile2 (~> 2.0.0.rc2)
+    oauth2 (1.1.0)
       faraday (>= 0.8, < 0.10)
-      jwt (~> 1.0)
+      jwt (~> 1.0, < 1.5.2)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
-      rack (~> 1.2)
-    rack (1.6.0)
-    rake (10.4.2)
+      rack (>= 1.2, < 3)
+    rack (1.6.4)
+    rake (10.5.0)
     rdoc (3.12.2)
       json (~> 1.4)
     rspec (3.1.0)
@@ -75,13 +82,13 @@ GEM
     rspec-mocks (3.1.3)
       rspec-support (~> 3.1.0)
     rspec-support (3.1.2)
-    simplecov (0.9.1)
+    simplecov (0.11.2)
       docile (~> 1.1.0)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.8.0)
-    simplecov-html (0.8.0)
+      json (~> 1.8)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
     thor (0.19.1)
-    thread_safe (0.3.4)
+    thread_safe (0.3.5)
 
 PLATFORMS
   ruby
@@ -95,3 +102,6 @@ DEPENDENCIES
   rspec (~> 3.1.0)
   simplecov
   thor (~> 0)
+
+BUNDLED WITH
+   1.11.2

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/features/generate.feature

@@ -18,12 +18,14 @@ Feature: Locamotion generate
       """
       value = 3
       string = "I am localized with a value of #{value}."._
+      item.title = NSString.stringWithFormat("Export All Contents in "%@"…"._, object.name)
       """
     And a file named "rm-project/resources/en.lproj/Localizable.strings" with:
     """
     "I am localized!" = "I am localized!";
     "I am also localized." = "I am also localized.";
     "I am localized with a value of #{value}." = "I am localized with a value of #{value}.";
+    "Export All Contents in "%@"…" = "Export All Contents in "%@"…";
     """
     Given a directory named "rm-project/resources/es.lproj"
     When I cd to "rm-project"
@@ -35,12 +37,13 @@ Feature: Locamotion generate
     from the English ones using 'locamotion generate'
 
     When I run `locamotion generate`
-    Then the output should contain "3 new strings"
+    Then the output should contain "4 new strings"
     And the file "resources/es.lproj/Localizable.strings" should contain:
       """
       "I am localized!" = "I am localized!";
       "I am also localized." = "I am also localized.";
       "I am localized with a value of #{value}." = "I am localized with a value of #{value}.";
+      "Export All Contents in "%@"…" = "Export All Contents in "%@"…";
       """
 
   Scenario: Generate Spanish and German strings
@@ -50,19 +53,21 @@ Feature: Locamotion generate
 
     Given a directory named "resources/de.lproj"
     When I run `locamotion generate`
-    Then the output should contain "3 new strings entered into resources/de.lproj/Localizable.strings"
-    Then the output should contain "3 new strings entered into resources/es.lproj/Localizable.strings"
+    Then the output should contain "4 new strings entered into resources/de.lproj/Localizable.strings"
+    Then the output should contain "4 new strings entered into resources/es.lproj/Localizable.strings"
     And the file "resources/es.lproj/Localizable.strings" should contain:
       """
       "I am localized!" = "I am localized!";
       "I am also localized." = "I am also localized.";
       "I am localized with a value of #{value}." = "I am localized with a value of #{value}.";
+      "Export All Contents in "%@"…" = "Export All Contents in "%@"…";
       """
     And the file "resources/de.lproj/Localizable.strings" should contain:
       """
       "I am localized!" = "I am localized!";
       "I am also localized." = "I am also localized.";
       "I am localized with a value of #{value}." = "I am localized with a value of #{value}.";
+      "Export All Contents in "%@"…" = "Export All Contents in "%@"…";
       """
 
   Scenario: Generate Spanish and German strings with some taken strings
@@ -81,16 +86,18 @@ Feature: Locamotion generate
     "I am also localized." = "Ich bin auch übersetzt.";
     """
     When I run `locamotion generate`
-    Then the output should contain "2 new strings entered into resources/de.lproj/Localizable.strings"
-    Then the output should contain "1 new string entered into resources/es.lproj/Localizable.strings"
+    Then the output should contain "3 new strings entered into resources/de.lproj/Localizable.strings"
+    Then the output should contain "2 new strings entered into resources/es.lproj/Localizable.strings"
     And the file "resources/es.lproj/Localizable.strings" should contain:
       """
       "I am localized with a value of #{value}." = "I am localized with a value of #{value}.";
+      "Export All Contents in "%@"…" = "Export All Contents in "%@"…";
       """
     And the file "resources/de.lproj/Localizable.strings" should contain:
       """
       "I am localized!" = "I am localized!";
       "I am localized with a value of #{value}." = "I am localized with a value of #{value}.";
+      "Export All Contents in "%@"…" = "Export All Contents in "%@"…";
       """
 
   Scenario: Generate Spanish and German strings with all taken strings
@@ -104,12 +111,14 @@ Feature: Locamotion generate
     "I am localized!" = "Tengo traduccion!";
     "I am also localized." = "Yo tambien tengo traduccion.";
     "I am localized with a value of #{value}." = "Tengo traduccion con el valor #{value}.";
+    "Export All Contents in "%@"…" = "Exportar contenidos de "%@"…";
     """
     Given a file named "resources/de.lproj/Localizable.strings" with:
     """
     "I am localized!" = "Ich bin übersetzt!";
     "I am also localized." = "Ich bin auch übersetzt.";
     "I am localized with a value of #{value}." = "Ich bin mit den wert #{value} übersetzt.";
+    "Export All Contents in "%@"…" = "Inhalt von "%@" exportieren…";
     """
     When I run `locamotion generate`
     Then the output should contain "No new strings added to resources/de.lproj/Localizable.strings"
@@ -119,12 +128,14 @@ Feature: Locamotion generate
       "I am localized!" = "Tengo traduccion!";
       "I am also localized." = "Yo tambien tengo traduccion.";
       "I am localized with a value of #{value}." = "Tengo traduccion con el valor #{value}.";
+      "Export All Contents in "%@"…" = "Exportar contenidos de "%@"…";
       """
     And the file "resources/de.lproj/Localizable.strings" should contain:
       """
       "I am localized!" = "Ich bin übersetzt!";
       "I am also localized." = "Ich bin auch übersetzt.";
       "I am localized with a value of #{value}." = "Ich bin mit den wert #{value} übersetzt.";
+      "Export All Contents in "%@"…" = "Inhalt von "%@" exportieren…";
       """
 
   Scenario: Attempt to run Locamotion where there's no RubyMotion project

data/features/slurp.feature

@@ -18,6 +18,11 @@ Feature: Locamotion slurp
       """
       value = 3
       string = "I am localized with a value of #{value}."._
+      item.title = NSString.stringWithFormat("Export All Contents in "%@"…"._, object.name)
+      """
+    And a file named "rm-project/app/test3.rb" with:
+      """
+      array = ['first string'._, 'second string'._, 'third string'._]
       """
     When I cd to "rm-project"
 
@@ -26,28 +31,36 @@ Feature: Locamotion slurp
     To slurp, the user has to call "locamotion slurp"
 
     When I run `locamotion slurp`
-    Then the output should contain "3 new strings"
+    Then the output should contain "7 new strings"
     And the file "resources/en.lproj/Localizable.strings" should contain:
       """
       "I am localized!" = "I am localized!";
       "I am also localized." = "I am also localized.";
       "I am localized with a value of #{value}." = "I am localized with a value of #{value}.";
+      "Export All Contents in "%@"…" = "Export All Contents in "%@"…";
+      "first string" = "first string";
+      "second string" = "second string";
+      "third string" = "third string";
       """
-  
+
   Scenario: Slurp with existing english files
 
     Users can add missing strings to their english file.
 
     Given a file named "resources/en.lproj/Localizable.strings" with:
     """
+    "Export All Contents in "%@"…" = "Export All Contents in "%@"…";
     "I am localized!" = "I am localized!";
     """
     When I run `locamotion slurp`
-    Then the output should contain "2 new strings"
+    Then the output should contain "5 new strings"
     And the file "resources/en.lproj/Localizable.strings" should contain:
     """
     "I am also localized." = "I am also localized.";
     "I am localized with a value of #{value}." = "I am localized with a value of #{value}.";
+    "first string" = "first string";
+    "second string" = "second string";
+    "third string" = "third string";
     """
 
   Scenario: Slurp with all existing english strings
@@ -59,6 +72,10 @@ Feature: Locamotion slurp
     "I am localized!" = "I am localized!";
     "I am also localized." = "I am also localized.";
     "I am localized with a value of #{value}." = "I am localized with a value of #{value}.";
+    "Export All Contents in "%@"…" = "Export All Contents in "%@"…";
+    "first string" = "first string";
+    "second string" = "second string";
+    "third string" = "third string";
     """
     When I run `locamotion slurp`
     Then the output should contain "No new strings"
@@ -67,6 +84,10 @@ Feature: Locamotion slurp
     "I am localized!" = "I am localized!";
     "I am also localized." = "I am also localized.";
     "I am localized with a value of #{value}." = "I am localized with a value of #{value}.";
+    "Export All Contents in "%@"…" = "Export All Contents in "%@"…";
+    "first string" = "first string";
+    "second string" = "second string";
+    "third string" = "third string";
     """
 
   Scenario: Attempt to run Locamotion where there's no RubyMotion project

data/lib/locamotion/app.rb

@@ -2,6 +2,8 @@ require 'thor'
 
 module Locamotion
   class App < Thor
+    map %w[--version -v] => :__print_version
+
     desc 'slurp', "Slurp the app's localized strings into the English localization"
 
     def slurp
@@ -22,6 +24,12 @@ module Locamotion
       end
     end
 
+    desc "--version, -v", "print the version"
+
+    def __print_version
+      puts '0.0.3'
+    end
+
     no_commands {
       def slurp_main
         matches = parse_rubymotion_app('app/**/*.rb')
@@ -62,8 +70,8 @@ module Locamotion
         matches = []
         Dir.glob(path) do |ruby_file|
           File.open(ruby_file).each do |line|
-            matches += line.scan(/"([^"]+)"\._/)
-            matches += line.scan(/'([^']+)'\._/)
+            matches += line.scan(/"(.*?)"\._/)
+            matches += line.scan(/'(.*?)'\._/)
           end
         end
         matches.flatten
@@ -89,7 +97,7 @@ module Locamotion
 
       def announce_slurp_results(strings_added_count)
         if strings_added_count > 0
-          "#{strings_added_count} new string#{strings_added_count == 1 ? '' : 's'} entered into ./resources/en.lproj/Localizable.strings"
+          "#{strings_added_count} new string#{strings_added_count == 1 ? '' : 's'} entered into resources/en.lproj/Localizable.strings"
         else
           'No new strings added.'
         end

data/locamotion.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: locamotion 0.0.2 ruby lib
+# stub: locamotion 0.0.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "locamotion"
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Ramon Huidobro"]
-  s.date = "2015-01-01"
+  s.date = "2016-02-27"
   s.description = "Locamotion (Localization Motion) is a Command Line tool to generate localizable files in RubyMotion projects. It parses the 'app' directory for SugarCube (https://github.com/rubymotion/sugarcube) strings, ending in '._'. It also transfers the english localized files into others."
   s.email = "ramon.martin.huidobro@gmail.com"
   s.executables = ["locamotion"]
@@ -43,7 +43,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/incbee/locamotion"
   s.licenses = ["MIT"]
-  s.rubygems_version = "2.4.5"
+  s.rubygems_version = "2.4.8"
   s.summary = "CLI tool to generate localizable files in RubyMotion projects"
 
   if s.respond_to? :specification_version then

data/spec/app_spec.rb

@@ -7,6 +7,7 @@ describe "Slurp" do
     content = <<-eos
     "I am localized!"._
     "I am also localized."._
+    "Export \"%@\" Object…"._
     eos
     File.open('/tmp/rm_project/app/test1.rb', 'a+') { |f| f.write(content) }
     File.open('/tmp/rm_project/app/test2.rb', 'a+') { |f| f.write("\"I am to be localized\"._") }
@@ -18,15 +19,15 @@ describe "Slurp" do
   end
 
   it "gets all localizable strings" do
-    expect(@app.parse_rubymotion_app('/tmp/rm_project/app/**/*.rb')).to match_array(["I am localized!", "I am also localized.", "I am to be localized"])
+    expect(@app.parse_rubymotion_app('/tmp/rm_project/app/**/*.rb')).to match_array(["I am localized!", "I am also localized.", "I am to be localized", "Export \"%@\" Object…"])
   end
 
-  it "announces 3 finished strings" do
-    expect(@app.announce_slurp_results(3)).to eq("3 new strings entered into ./resources/en.lproj/Localizable.strings")
+  it "announces 4 finished strings" do
+    expect(@app.announce_slurp_results(4)).to eq("4 new strings entered into resources/en.lproj/Localizable.strings")
   end
 
   it "announces 1 finished string" do
-    expect(@app.announce_slurp_results(1)).to eq("1 new string entered into ./resources/en.lproj/Localizable.strings")
+    expect(@app.announce_slurp_results(1)).to eq("1 new string entered into resources/en.lproj/Localizable.strings")
   end
 
   it "announces no finished strings" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: locamotion
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Ramon Huidobro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-01 00:00:00.000000000 Z
+date: 2016-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -173,7 +173,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: CLI tool to generate localizable files in RubyMotion projects