tcl-msgcat 0.5 → 1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d08c896d423e775ef1b282c5399bd57087c3ef7
-  data.tar.gz: c66f9414471f9a514af85e9ea1cf7f6eadf36204
+  metadata.gz: be4b96c3cc4b7b3dc399e0c66882623e888ee087
+  data.tar.gz: 317497d8d0e58a1d2755e187e2179abd31c8cb3d
 SHA512:
-  metadata.gz: e290d35a7c371da396f1a6705b7d464fddecaab9ee44748415f9d0a7569781ed3b8128995f678acb7214e291c92c90145b3a2dc3ee3e40308e5541d94ff934bf
-  data.tar.gz: b93c2286e49c180b27d5635918b993cecc804f48a357bfa400fa961dbf80a657fc5527b0ef043285648b9427d3b9e277864b985ad741869b80bbe5ab9f67082a
+  metadata.gz: b330d8ae54aa23d480fcf744d936574b04ccb50db2665c671c29421fe3fbecd630ca691195f24641a3df93f65efb05628be64b83bb4aed7b1ce44e7e31ab992f
+  data.tar.gz: 9447c6c2834895c966199dd6b76a0af0ae2710e27a03423df7ea8a275eede53ff465248d284b21cef795b9cb2dcedb073714fa6956551b56130f1356a026fe94

data/README.md

@@ -32,26 +32,26 @@ Or install it yourself as:
 
 You'll want to convert your existing files first.  You can do this with the following command:
 
-    msgcat parse root.msg > root.json
-    msgcat parse zh_tw.msg > zh_tw.json
+    tcl-msgcat parse root.msg > root.json
+    tcl-msgcat parse zh_tw.msg > zh_tw.json
 
 And render it back to the msgcat file:
 
-    msgcat render root.json > root.test.msg
+    tcl-msgcat render root.json > root.test.msg
 
 OK, now say you have added a bunch of strings to your `root.json` for some new stuff in the application. You
 will want to update all your other files with those strings, and send them off to your translators.  For this
 there is the `merge` action with a few ways to use it:
 
-    msgcat merge root.json fr.json de.json es.json # specify files individually
-    msgcat merge root.json *.json                  # or glob them (root.json is automatically excluded)
+    tcl-msgcat merge root.json fr.json de.json es.json # specify files individually
+    tcl-msgcat merge root.json *.json                  # or glob them (root.json is automatically excluded)
 
 Now you have got your files back from the translators, put them through a [linter](http://jsonlint.com/)
 and found no errors.  You are ready to put those new translations back into your application. Use the `compile`
 action to run the render command on all your json files:
 
-    msgcat compile ui/msgs                 # only one arg needed if you don't segregate source/compiled
-    msgcat compile ui/msgs/source ui/msgs  # otherwise specify the source and compile paths seperately
+    tcl-msgcat compile ui/msgs                 # only one arg needed if you don't segregate source/compiled
+    tcl-msgcat compile ui/msgs/source ui/msgs  # otherwise specify the source and compile paths seperately
 
 ## Contributing
 

data/bin/tcl-msgcat

@@ -0,0 +1,44 @@
+#!/usr/bin/env ruby
+
+require 'tcl/msgcat'
+
+case ARGV[0]
+when "parse", "p"
+  file = ARGV[1]
+  puts Tcl::Msgcat.parse(file).to_json
+when "uglify", "u"
+  file = ARGV[1]
+  puts Tcl::Msgcat.parse(file).to_json(false)
+when "render", "r"
+  file = ARGV[1]
+  puts Tcl::Msgcat.render(file).to_s
+when "merge", "m"
+  root = ARGV[1]
+  files = ARGV[2..-1]
+  Tcl::Msgcat.merge(root, files)
+when "compile"
+  source_path = ARGV[1]
+  target_path = ARGV[2] || ARGV[1]
+
+  Tcl::Msgcat.compile(source_path, target_path)
+else
+  puts <<-EOH
+Usage: msgcat <action> <arguments>
+
+Actions:
+  p|parse <file>               Parse a msgcat file and output JSON
+  u|uglify <file>              Parse a msgcat file and output ugly JSON
+  r|render <file>              Parse a JSON file and output msgcat
+  m|merge <root> <files>       Merge new keys from root into the files (glob pattern)
+  c|compile <source> [target]  Compile from the source into the target
+
+Examples:
+  tcl-msgcat parse ROOT.msg > root.json
+  tcl-msgcat uglify ROOT.msg > root.json
+  tcl-msgcat render root.json > ROOT.msg
+  tcl-msgcat merge root.json path/to/translations/*.json
+  tcl-msgcat merge root.json zh_tw.json fr.json de.json
+  tcl-msgcat compile path/to/my/json/files path/to/my/msgcat/files
+  tcl-msgcat compile path/to/my/json/msgcat/files
+  EOH
+end

data/lib/tcl/msgcat/catalog.rb

@@ -11,6 +11,10 @@ module Tcl
         @msgs = catalog.msgs.merge(@msgs, &merger)
       end
 
+      def to_json(pretty=true)
+        @msgs.to_json
+      end
+
       def self.load(file)
         msgs = JSON.parse(File.read(file))
         Tcl::Msgcat::Catalog.new(msgs)

data/lib/tcl/msgcat/version.rb

@@ -1,5 +1,5 @@
 module Tcl
   module Msgcat
-    VERSION = "0.5"
+    VERSION = "1.0"
   end
 end

data/lib/tcl/msgcat.rb

@@ -6,45 +6,47 @@ require "tcl/msgcat/renderer"
 
 module Tcl
   module Msgcat
-    def parse(msgcat_file)
-      Tcl::Msgcat::Parser.new(msgcat_file).parse
-    end
-
-    def render(json_file)
-      raise ArgumentError, "File not found: #{json_file}" unless File.exist? json_file
-      msgs = JSON.parse(File.read(json_file))
-      Tcl::Msgcat::Renderer.new(msgs).render
-    end
+    class << self
+      def parse(msgcat_file)
+        Tcl::Msgcat::Parser.new(msgcat_file).parse
+      end
 
-    def merge(root_file, translation_files=[])
-      if translation_files.is_a? String
-        translation_files = Dir[translation_files]
+      def render(json_file)
+        raise ArgumentError, "File not found: #{json_file}" unless File.exist? json_file
+        msgs = JSON.parse(File.read(json_file))
+        Tcl::Msgcat::Renderer.new(msgs).render
       end
 
-      root = Tcl::Msgcat::Catalog.load(root_file)
+      def merge(root_file, translation_files=[])
+        if translation_files.is_a? String
+          translation_files = Dir[translation_files]
+        end
+
+        root = Tcl::Msgcat::Catalog.load(root_file)
 
-      translation_files.each do |file|
-        next if File.basename(file) == File.basename(root_file)
-        print "Merging new translations into #{file}... "
-        catalog = Tcl::Msgcat::Catalog.load(file)
-        catalog.merge!(root)
-        File.open(file, "w") {|f| f.write catalog.to_json }
-        puts "done"
+        translation_files.each do |file|
+          next if File.basename(file) == File.basename(root_file)
+          print "Merging new translations into #{file}... "
+          catalog = Tcl::Msgcat::Catalog.load(file)
+          catalog.merge!(root)
+          File.open(file, "w") {|f| f.write catalog.to_json }
+          puts "done"
+        end
       end
-    end
 
-    def compile(source, target)
-      raise ArgumentError, "Not a directory: #{source}" unless File.directory? source
-      raise ArgumentError, "Not a directory: #{target}" unless File.directory? target
+      def compile(source, target)
+        raise ArgumentError, "Not a directory: #{source}" unless File.directory? source
+        raise ArgumentError, "Not a directory: #{target}" unless File.directory? target
 
-      Dir["#{source}/*.json"].each do |src|
-        dst = File.basename(src, ".json")+".msg"
-        print "Compiling #{src} to #{target}/#{dst}... "
-        msgs = JSON.parse(File.read(src))
-        renderer = Tcl::Msgcat::Renderer.new(msgs).render
-        File.write("#{target}/#{dst}") {|f| f.write renderer.to_s }
-        puts "done"
+        Dir["#{source}/*.json"].each do |src|
+          dst = File.basename(src, ".json")+".msg"
+          print "Compiling #{src} to #{target}/#{dst}... "
+          msgs = JSON.parse(File.read(src))
+          renderer = Tcl::Msgcat::Renderer.new(msgs).render
+          File.write("#{target}/#{dst}") {|f| f.write renderer.to_s }
+          puts "done"
+        end
       end
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tcl-msgcat
 version: !ruby/object:Gem::Version
-  version: '0.5'
+  version: '1.0'
 platform: ruby
 authors:
 - Robert McLeod
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-22 00:00:00.000000000 Z
+date: 2015-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -42,7 +42,7 @@ description: Library for parsing, rendering and merging TCL msgcat files
 email:
 - robert@autogrow.com
 executables:
-- msgcat
+- tcl-msgcat
 extensions: []
 extra_rdoc_files: []
 files:
@@ -51,7 +51,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/msgcat
+- bin/tcl-msgcat
 - lib/tcl/msgcat.rb
 - lib/tcl/msgcat/catalog.rb
 - lib/tcl/msgcat/parser.rb

data/bin/msgcat

@@ -1,39 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'tcl-msgcat'
-
-case ARGV[0]
-when "parse", "p"
-  file = ARGV[1]
-  puts Tcl::Msgcat.parse(file).to_json
-when "render", "r"
-  file = ARGV[1]
-  puts Tcl::Msgcat.render(file).to_s
-when "merge", "m"
-  root = ARGV[1]
-  files = ARGV[2..-1]
-  Tcl::Msgcat.merge(root, files)
-when "compile"
-  source_path = ARGV[1]
-  target_path = ARGV[2] || ARGV[1]
-
-  Tcl::Msgcat.compile(source_path, target_path)
-else
-  puts <<-EOH
-Usage: msgcat <action> <arguments>
-
-Actions:
-  parse <file>               Parse a msgcat file and output JSON
-  render <file>              Parse a JSON file and output msgcat
-  merge <root> <files>       Merge new keys from root into the files (glob pattern)
-  compile <source> [target]  Compile from the source into the target
-
-Examples:
-  msgcat parse ROOT.msg > root.json
-  msgcat render root.json > ROOT.msg
-  msgcat merge root.json path/to/translations/*.json
-  msgcat merge root.json zh_tw.json fr.json de.json
-  msgcat compile path/to/my/json/files path/to/my/msgcat/files
-  msgcat compile path/to/my/json/msgcat/files
-  EOH
-end