lang 0.1.0.pre → 0.1.0

data/README.rdoc

@@ -18,7 +18,7 @@ Language tags implementation.
 == INSTALLATION:
 
   $ gem in lang
-  $ lang update
+  $ lang index -u
 
 == LICENSE:
 

data/bin/lang

@@ -2,149 +2,6 @@
 
 dir = File.expand_path(File.dirname(__FILE__) + '/../lib')
 $:.unshift(dir) unless $:.include?(dir)
-require 'lang/subtags'
 
-require 'net/http'
-require 'tempfile'
-
-module Lang
-  module Subtags
-    class Registry
-
-      NAME_REGEX = /^(?:#{SUBTAG}|#{TAG}):\s*([\w-]+)\s*$/io.freeze
-      TYPE_REGEX = /^#{TYPE}:\s*(\w+)\s*$/io.freeze
-
-      def initialize(path)
-        @path = File.expand_path(path)
-      end
-
-      def exists?
-        File.exists?("#{@path}.registry")
-      end
-
-      def download(uri)
-        FileUtils.mkdir_p(File.dirname(@path)) unless exists?
-        write("registry") { |temp| http(uri) { |chunk| temp << chunk }}
-      end
-
-      def build_indices
-        return false unless exists?
-
-        STDOUT << "Building indices\n"
-        calculate_indices
-        calculate_boundaries
-
-        write("indices") do |temp|
-          @boundaries.each do |boundary|
-            template = "%-#{boundary[-2]}s%#{boundary[-1] - boundary[-2] - 1}d\n"
-            @indices[boundary.first].to_a.sort.each { |k,v| temp << template % [k,v] }
-          end
-        end
-
-        write("boundaries") do |temp|
-          @boundaries.each do |boundary|
-            temp << "#{boundary.join(":")}\n"
-          end
-        end
-
-        STDOUT << "Done\n"
-        true
-      end
-
-      private
-
-      def write(dest, &block)
-
-        path = "#{@path}.#{dest}"
-        temp = Tempfile.new(dest)
-        temp.binmode
-        yield(temp) if block_given?
-        temp.close
-
-        # somewhat stolen from ActiveSupport
-
-        begin
-          old = File.stat(path)
-        rescue Errno::ENOENT
-          check = File.join(File.dirname(path), ".permissions_check.#{Thread.current.object_id}.#{Process.pid}.#{rand(1000000)}")
-          File.open(check, File::WRONLY | File::CREAT) { }
-          old = File.stat(check)
-          File.unlink(check)
-        end
-
-        FileUtils.mv(temp.path, "#{@path}.#{dest}")
-
-        File.chown(old.uid, old.gid, path)
-        File.chmod(old.mode, path)
-        nil
-      end
-
-      def http(uri)
-        STDOUT << "Downloading #{uri}\n"
-        Net::HTTP.get_response(URI(uri)) do |response|
-          total, size = response['Content-Length'].to_i, 0
-          response.read_body do |chunk|
-            size += chunk.size
-            yield(chunk) if block_given?
-            STDOUT << "\r%d%% done (%d of %d)" % [size*100/total, size, total]
-            STDOUT.flush
-          end
-        end
-        STDOUT << "\n"
-        nil
-      end
-
-      def calculate_boundaries
-        calculate_indices unless @indices
-        offset = 0
-        @boundaries = @indices.keys.sort{ |a,b| a.to_s <=> b.to_s }.map do |kind|
-          segment   = @indices[kind]
-          boundary  = []
-          boundary << kind
-          boundary << offset
-          boundary << segment.size - 1
-          boundary << segment.keys.map{ |s| s.size }.max
-          boundary << segment.values.max.to_s.size + boundary.last + 1
-          offset   += segment.size * boundary.last
-          boundary
-        end
-        true
-      end
-
-      def calculate_indices
-        count = 0
-        kind, name = nil, nil
-        @indices = {}
-        File.open("#{@path}.registry", File::RDONLY) do |f|
-          f.each_line do |l|
-            if TYPE_REGEX === l
-              kind = $1.to_sym
-              @indices[kind] ||= {}
-            elsif kind && NAME_REGEX === l
-              name = $1.downcase
-              @indices[kind][name] = count
-            elsif l == SEPARATOR
-              kind, name = nil, nil
-            end
-            count += l.size
-          end
-        end
-        #STDOUT << "#{count}\n"
-        true
-      end
-
-    end
-  end
-end
-
-command = ARGV.shift
-unless %w(reindex update).include?(command)
-  STDERR << "unknown command: #{command.inspect}\n"
-  exit 1
-end
-
-registry = Lang::Subtags::Registry.new(ARGV.shift || Lang::Subtags.registry_path)
-registry.download("http://www.iana.org/assignments/language-subtag-registry") if command == 'update' || !registry.exists?
-registry.build_indices
-
-# EOF
+require 'lang/cli'
+Lang::Cli.start(ARGV)

data/lib/lang/cli.rb

@@ -0,0 +1,147 @@
+require 'thor' unless defined?(Thor)
+require 'lang/subtags'
+require 'net/http'
+require 'tempfile'
+
+module Lang #:nodoc:
+  class Cli < Thor
+
+    class_option :quiet, :type => :boolean, :aliases => '-q', :desc => 'Run command queitly.'
+
+    desc 'index [options]', 'Prepare lang to use a language-subtag-registry.'
+    method_option :update, :type => :boolean, :aliases => '-u', :desc => 'Update registry.'
+
+    def index(path = Lang::Subtags.registry_path)
+      @path = File.expand_path(path)
+      if !exists? || options.update?
+        download 'http://www.iana.org/assignments/language-subtag-registry'
+      end
+      build_indices
+    end
+
+    NAME_REGEX = /^(?:#{Subtags::SUBTAG}|#{Subtags::TAG}):\s*([\w-]+)\s*$/io.freeze
+    TYPE_REGEX = /^#{Subtags::TYPE}:\s*(\w+)\s*$/io.freeze
+
+    private
+
+    def exists?
+      File.exists?("#{@path}.registry")
+    end
+
+    def download(uri)
+      FileUtils.mkdir_p(File.dirname(@path)) unless exists?
+      write("registry") { |temp| http(uri) { |chunk| temp << chunk }}
+    end
+
+    def build_indices
+      return false unless exists?
+
+      say "Building indices"
+      calculate_indices
+      calculate_boundaries
+
+      write("indices") do |temp|
+        @boundaries.each do |boundary|
+          template = "%-#{boundary[-2]}s%#{boundary[-1] - boundary[-2] - 1}d\n"
+          @indices[boundary.first].to_a.sort.each { |k,v| temp << template % [k,v] }
+        end
+      end
+
+      write("boundaries") do |temp|
+        @boundaries.each do |boundary|
+          temp << "#{boundary.join(":")}\n"
+        end
+      end
+
+      say "Done"
+      true
+    end
+
+    private
+
+    def say(*args)
+      super unless options.quiet?
+    end
+
+    def write(dest, &block)
+
+      path = "#{@path}.#{dest}"
+      temp = Tempfile.new(dest)
+      temp.binmode
+      yield(temp) if block_given?
+      temp.close
+
+      # somewhat stolen from ActiveSupport
+
+      begin
+        old = File.stat(path)
+      rescue Errno::ENOENT
+        check = File.join(File.dirname(path), ".permissions_check.#{Thread.current.object_id}.#{Process.pid}.#{rand(1000000)}")
+        File.open(check, File::WRONLY | File::CREAT) { }
+        old = File.stat(check)
+        File.unlink(check)
+      end
+
+      FileUtils.mv(temp.path, "#{@path}.#{dest}")
+
+      File.chown(old.uid, old.gid, path)
+      File.chmod(old.mode, path)
+      nil
+    end
+
+    def http(uri)
+      say "Downloading #{uri}"
+      Net::HTTP.get_response(URI(uri)) do |response|
+        total, size = response['Content-Length'].to_i, 0
+        response.read_body do |chunk|
+          size += chunk.size
+          yield(chunk) if block_given?
+          say "\r%d%% done (%d of %d)" % [size*100/total, size, total], nil, false
+          STDOUT.flush unless options.quiet?
+        end
+      end
+      say "\n"
+      nil
+    end
+
+    def calculate_boundaries
+      calculate_indices unless @indices
+      offset = 0
+      @boundaries = @indices.keys.sort{ |a,b| a.to_s <=> b.to_s }.map do |kind|
+        segment   = @indices[kind]
+        boundary  = []
+        boundary << kind
+        boundary << offset
+        boundary << segment.size - 1
+        boundary << segment.keys.map{ |s| s.size }.max
+        boundary << segment.values.max.to_s.size + boundary.last + 1
+        offset   += segment.size * boundary.last
+        boundary
+      end
+      true
+    end
+
+    def calculate_indices
+      count = 0
+      kind, name = nil, nil
+      @indices = {}
+      File.open("#{@path}.registry", File::RDONLY) do |f|
+        f.each_line do |l|
+          if TYPE_REGEX === l
+            kind = $1.to_sym
+            @indices[kind] ||= {}
+          elsif kind && NAME_REGEX === l
+            name = $1.downcase
+            @indices[kind][name] = count
+          elsif l == Subtags::SEPARATOR
+            kind, name = nil, nil
+          end
+          count += l.size
+        end
+      end
+      #STDOUT << "#{count}\n"
+      true
+    end
+
+  end
+end

data/lib/lang/version.rb

@@ -1,5 +1,5 @@
 module Lang #:nodoc:
-  VERSION = "0.1.0.pre".freeze
+  VERSION = "0.1.0".freeze
 end
 
 # EOF

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: lang
 version: !ruby/object:Gem::Version 
-  hash: 961915980
-  prerelease: true
+  hash: 27
+  prerelease: false
   segments: 
   - 0
   - 1
   - 0
-  - pre
-  version: 0.1.0.pre
+  version: 0.1.0
 platform: ruby
 authors: 
 - SSDany
@@ -16,25 +15,39 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-06 00:00:00 +04:00
+date: 2010-11-05 00:00:00 +03:00
 default_executable: lang
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  name: thor
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 3
         segments: 
-        - 1
-        - 2
         - 0
-        version: 1.2.0
+        version: "0"
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
+  prerelease: false
   type: :development
-  version_requirements: *id001
+  name: rspec
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 2
+        - 0
+        - 0
+        version: 2.0.0
+  requirement: *id002
 description: |
   Language tags implementation.
   Features: basic and extended filtering (RFC 4647), canonicalization (using IANA language subtag registry).
@@ -48,6 +61,7 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - README.rdoc
+- lib/lang/cli.rb
 - lib/lang/subtags/entry.rb
 - lib/lang/subtags/extlang.rb
 - lib/lang/subtags/grandfathered.rb
@@ -89,14 +103,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: lang