i18n_sync 0.0.2 → 0.0.4

data/.gitignore

@@ -19,3 +19,4 @@ rdoc
 pkg
 
 ## PROJECT::SPECIFIC
+spec/work/*

data/Rakefile

@@ -18,21 +18,21 @@ rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
+# require 'spec/rake/spectask'
+# Spec::Rake::SpecTask.new(:spec) do |spec|
+#   spec.libs << 'lib' << 'spec'
+#   spec.spec_files = FileList['spec/**/*_spec.rb']
+# end
 
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
+# Spec::Rake::SpecTask.new(:rcov) do |spec|
+#   spec.libs << 'lib' << 'spec'
+#   spec.pattern = 'spec/**/*_spec.rb'
+#   spec.rcov = true
+# end
 
-task :spec => :check_dependencies
+# task :spec => :check_dependencies
 
-task :default => :spec
+# task :default => :spec
 
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.4

data/bin/i18s

@@ -24,12 +24,14 @@ Usage: #{File.basename($0)} <path/to/master.yml> [args]
 
 Options are:
 
-     -O --no-order  -  Order by name
-     -t --trace     -  Be more verbose
+     -o --order    -  Order by name
+     -t --trace    -  Be more verbose
 
 Common usage:
 
-   i18s ./en-US.yml
+   i18s ./en-US.yml    - Will sync all files with en-US
+   i18s ./en-US.yml pt - Creates a new translate file pt.yml
+
 
 BANNER
   opts.on("-O", "--no-order", "Table order" ) { Options[:order] = false }

data/i18n_sync.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{i18n_sync}
-  s.version = "0.0.2"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marcos Piccinini"]
-  s.date = %q{2010-05-17}
+  s.date = %q{2010-07-16}
   s.default_executable = %q{i18s}
   s.description = %q{Gem to sync all locale yml/rb files based on a "master" one.}
   s.email = %q{x@nofxx.com}
@@ -29,6 +29,10 @@ Gem::Specification.new do |s|
      "i18n_sync.gemspec",
      "lib/i18n_sync.rb",
      "spec/fixtures/en.yml",
+     "spec/fixtures/named.en.yml",
+     "spec/fixtures/named.pt.yml",
+     "spec/fixtures/order.en.yml",
+     "spec/fixtures/order.pt.yml",
      "spec/fixtures/pt.yml",
      "spec/i18n_sync_spec.rb",
      "spec/spec_helper.rb"
@@ -36,7 +40,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/nofxx/i18n_sync}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Syncs all locale yml/rb files based on a "master" one.}
   s.test_files = [
     "spec/spec_helper.rb",
@@ -47,7 +51,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
     else
       s.add_dependency(%q<rspec>, [">= 1.2.9"])

data/lib/i18n_sync.rb

@@ -8,7 +8,10 @@ class I18S
     @fullpath, *new_ones = argv
     @file, *path = @fullpath.split("/").reverse # hm.. hack,,, in 1.9
     @path = path.reverse.join("/")              # can splat the first
-    @lang = @file.split(".")[0]
+    @path ||= "."
+    s = @file.split(".")
+    @namespace =  s.length > 2 ? s[0]  : false
+    @lang = s[-2]
     @debug = opts[:trace]
     @order = opts[:order]
     puts "Start work on #{@file} (#{@lang})"
@@ -27,6 +30,10 @@ class I18S
     Dir["#{@path}/*.{yml,rb}"].each do |filename|
       #next if filename.match('_rails')
       basename = File.basename(filename, '.yml')
+      if basename =~ /\./
+        n, basename = basename.split(".")
+        next unless @namespace && @namespace == n
+      end
       puts "Writing #{filename} -> #{basename}"
       (comments, other) = read_file(filename, basename)
       @words.each { |k,v| other[k] ||= @words[k] }                    #Initializing hash variable as empty if it does not exist
@@ -36,7 +43,7 @@ class I18S
   end
 
   def create(file)
-    fullpath = "#{@path}/#{file}.yml"
+    fullpath = file =~ /\// ? file : "#{@path}/#{file}.yml"
     return puts("File exists.") if File.exists?(fullpath)
     write_file(fullpath, file, "", @words)
   end

data/spec/fixtures/en.yml

@@ -1,4 +1,4 @@
 
-en: 
+en:
   sync: To Sync It!
   test: Test

data/spec/fixtures/named.en.yml

@@ -0,0 +1,4 @@
+
+en:
+  something: Something
+  another: Another

data/spec/fixtures/named.pt.yml

@@ -0,0 +1,3 @@
+
+pt:
+  something: Algo

data/spec/fixtures/order.en.yml

@@ -0,0 +1,3 @@
+en:
+  blue: Blue
+  alpha: Alpha

data/spec/fixtures/order.pt.yml

@@ -0,0 +1,4 @@
+pt:
+  zebra: Zebra
+  blue: Azul
+  alpha: Alfa

data/spec/fixtures/pt.yml

@@ -1,4 +1,5 @@
 
-pt: 
+pt:
   sync: To Sync It!
   test: Teste
+  new: "Uau, isso é novo"

data/spec/i18n_sync_spec.rb

@@ -1,7 +1,39 @@
+# -*- coding: utf-8 -*-
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
+EN = "spec/work/en.yml"
+
 describe "I18nSync" do
-  it "fails" do
-    fail "hey buddy, you should probably rename this file and start specing for real"
+  before do
+    `rm -rf spec/work`
+    `cp -rf spec/fixtures spec/work`
+  end
+
+  it "should create a new one" do
+    newfile = "spec/work/fo.yml"
+    `rm #{newfile}` if File.exists?(newfile)
+    `bin/i18s #{EN} fo`
+    File.read(newfile).should eql("\nfo: \n  sync: To Sync It!\n  test: Test\n")
+  end
+
+  it "should sync files nicely" do
+    `bin/i18s spec/work/pt.yml`
+    File.read(EN).should eql("\nen: \n  new: \"Uau, isso é novo\"\n  sync: To Sync It!\n  test: Test\n")
+  end
+
+  it "should respect namespaces" do
+    `bin/i18s spec/work/pt.yml`
+    File.read("spec/work/named.pt.yml").should eql("\npt:\n  something: Algo\n")
+  end
+
+  it "should respect namespaces" do
+    `bin/i18s spec/work/named.en.yml`
+    File.read("spec/work/named.pt.yml").should eql("\npt: \n  another: Another\n  something: Algo\n")
+  end
+
+  it "should order alphabeticaly namespaces" do
+    `bin/i18s spec/work/order.pt.yml`
+    File.read("spec/work/order.en.yml").should eql("\nen: \n  alpha: Alpha\n  blue: Blue\n  zebra: Zebra\n")
+    File.read("spec/work/named.pt.yml").should eql("\npt:\n  something: Algo\n")
   end
 end

data/spec/spec_helper.rb

@@ -1,9 +1,14 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+TEST = true
 require 'i18n_sync'
-require 'spec'
-require 'spec/autorun'
-
-Spec::Runner.configure do |config|
-  
+begin
+  require 'spec'
+  require 'spec/autorun'
+rescue LoadError
+  require 'rspec'
 end
+
+# Spec::Runner.configure do |config|
+
+# end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Marcos Piccinini
@@ -14,13 +14,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-17 00:00:00 -03:00
+date: 2010-07-16 00:00:00 -03:00
 default_executable: i18s
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -51,6 +52,10 @@ files:
 - i18n_sync.gemspec
 - lib/i18n_sync.rb
 - spec/fixtures/en.yml
+- spec/fixtures/named.en.yml
+- spec/fixtures/named.pt.yml
+- spec/fixtures/order.en.yml
+- spec/fixtures/order.pt.yml
 - spec/fixtures/pt.yml
 - spec/i18n_sync_spec.rb
 - spec/spec_helper.rb
@@ -64,6 +69,7 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -71,6 +77,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -80,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Syncs all locale yml/rb files based on a "master" one.