chivy 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1603bd0a85a275283a45ce56b63e9bb845e2a26b
-  data.tar.gz: 3e293b627cf02cddf8b271e59f518d6eb1ceeac9
+  metadata.gz: abff556fc83657742b15d3dfbcbd5ef90f94969b
+  data.tar.gz: 04d0f36a7fc79657ea3eae9b6f65b527240cc0aa
 SHA512:
-  metadata.gz: cb0d8aa1ff2d7d738cfb5b20502384a2918395eccedc40e33aebd03b13fee696abd0f19586ce8c65f740234f9b823a366d2e99af98962aad5aa18a0c69a026b4
-  data.tar.gz: 287d6a198e851d116d81cb04dd07d99e3514010031068dedae5066e46d99ad760d740a0fa48a6b21eb714aee9bf8cf9fabb21fd5444c2f2ef1e5cd842b53b4eb
+  metadata.gz: 693d12f17cf0c4fc32c84198bc181727c6535cd94e47a4f73cb727d7d0b2992aede898f0cda41854fa583a15fc6f0281babd1cbb1b5ae8bef4fe56978d1f91be
+  data.tar.gz: 3d3b7b9cac1b643c391fbc8d8a6f8bc05f43dc7c8ad609fe33bd22b2cf7382b3d4e91eeff117d8cb98c5ed50fc5589842aa79080fccac4693ce18f572935d223

data/README.md

@@ -2,8 +2,8 @@
 
 Offers a quick way of analyzing language YAML-files and to add missing translation keys from the CLI.
 
-[![Gem Version](https://img.shields.io/gem/v/chivy.svg)](https://rubygems.org/gems/woro)
-[![Gem Downloads](https://img.shields.io/gem/dt/chivy.svg)](https://rubygems.org/gems/woro)
+[![Gem Version](https://img.shields.io/gem/v/chivy.svg)](https://rubygems.org/gems/chivy)
+[![Gem Downloads](https://img.shields.io/gem/dt/chivy.svg)](https://rubygems.org/gems/chivy)
 [![Yard Docs](http://img.shields.io/badge/yard-docs-blue.svg)](http://rubydoc.info/github/dahie/chivy)
 
 

data/bin/chivy

@@ -19,49 +19,19 @@ command :list do |c|
   c.action do |args, options|
 
     folder = args[1] || '.'
-
     files = Dir.entries(folder)
 
-    # find base locales
-    base_locales = {}
-    base_names = {}
-    files.each do |filename|
-      if filename.match(/(\S*)\.(\S*)(.yml)/)
-
-
-        tree = Chivy::Tree.new filename
-        tree.load File.join(folder, filename)
-
-        if base_locales.include? tree.locale
-          base_locales[tree.locale] << tree.name
-        else
-          base_locales[tree.locale] = [tree.name]
-        end
-
-        if base_names.include? tree.name
-          base_names[tree.name] << tree
-        else
-          base_names[tree.name] = [tree]
-        end
-      else
-        # TODO error message
-
-      end
-    end
-
-    processed_files = []
-
-    base_names.each_key do |name|
-      reference_tree = base_names[name].first
-      base_names[name].each do |tree|
+    tree_manager = Chivy::TreeManager.load(folder, files)
+    tree_manager.each_base_name do |reference_tree|
+      tree_manager.each_base_name do |tree|
         next if tree.file == reference_tree.file
 
-        puts "--- #{reference_tree.file} to #{tree.file}"
+        say "\n--- #{tree.file} to #{reference_tree.file}"
 
         diffs = HashDiff.diff(reference_tree.tree, tree.tree)
         diffs.each do |diff_set|
-          if diff_set[0] == '-' || diff_set[0] == '+' || diff_set[2] == nil || diff_set[3] == nil
-            puts "#{diff_set[0]} #{diff_set[1]}: #{diff_set[2]}"
+          if relevant_change?(diff_set)
+            say(color("#{diff_set[0]} #{diff_set[1]}: #{diff_set[2]}", change_color(diff_set[0])))
           end
         end
       end
@@ -69,3 +39,18 @@ command :list do |c|
   end
 end
 alias_command :ls, :list, :check
+
+def relevant_change?(diff_set)
+  diff_set[0] == '-' || diff_set[0] == '+' || diff_set[2] == nil || diff_set[3] == nil
+end
+
+def change_color(change_type)
+  case change_type
+  when '-'
+    :red
+  when '+'
+    :green
+  else
+    :orange
+  end
+end

data/lib/chivy.rb

@@ -1,4 +1,4 @@
 require 'chivy/version'
 require 'chivy/tree'
 require 'chivy/tree_diff'
-require 'chivy/key_list'
+require 'chivy/tree_manager'

data/lib/chivy/tree_manager.rb

@@ -0,0 +1,65 @@
+module Chivy
+  class TreeManager
+
+    TRANSLATION_YML_REGEX = /(\S*)\.(\S*)(.yml)/
+
+
+    attr_accessor :files, :folder, :loaded_files, :base_locales, :base_names
+
+
+    def initialize(folder, files)
+      @files = files
+      @folder = folder
+      @base_names = {}
+      @base_locales = {}
+      @loaded_files = []
+    end
+
+    # returns files successfully loaded
+    def self.load(folder, files)
+      tree_manager = TreeManager.new(folder, files)
+      tree_manager.fill
+      tree_manager
+    end
+
+    def each_base_name &block
+      base_names.each do |name, trees|
+        trees.each do |tree|
+          block.call(tree)
+        end
+      end
+    end
+
+
+    def fill
+      files.each do |filename|
+        if filename.match TRANSLATION_YML_REGEX
+          tree = Chivy::Tree.new filename
+          tree.load File.join(folder, filename)
+          loaded_files << filename
+          add_base_name(tree)
+          add_base_locale(tree)
+        end
+      end
+    end
+
+    protected
+
+
+    def add_base_name(tree)
+      if base_names.include? tree.name
+        base_names[tree.name] << tree
+      else
+        base_names[tree.name] = [tree]
+      end
+    end
+
+    def add_base_locale(tree)
+      if base_locales.include? tree.locale
+        base_locales[tree.locale] << tree.name
+      else
+        base_locales[tree.locale] = [tree.name]
+      end
+    end
+  end
+end

data/lib/chivy/version.rb

@@ -1,4 +1,4 @@
 module Chivy
   # Look shiny!
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chivy
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Daniel Senff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-16 00:00:00.000000000 Z
+date: 2016-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -168,10 +168,10 @@ files:
 - chivy.gemspec
 - lib/chivy.rb
 - lib/chivy/configuration.rb
-- lib/chivy/key_list.rb
 - lib/chivy/task_helper.rb
 - lib/chivy/tree.rb
 - lib/chivy/tree_diff.rb
+- lib/chivy/tree_manager.rb
 - lib/chivy/version.rb
 homepage: http://github.com/Dahie/chivy
 licenses:

data/lib/chivy/key_list.rb

@@ -1,82 +0,0 @@
-require 'ostruct'
-require 'commander'
-include Commander::UI
-
-module Chivy
-  # Generates the list of all missing keys and prints out to the console.
-  class KeyList
-    attr_reader :config, :list
-
-    def initialize(translations)
-      @config = config
-      @list = []
-    end
-
-    # Determine the max count of characters for all task names.
-    # @return [integer] count of characters
-    def width
-      @width ||= list.map { |t| t.name_with_args ? t.name_with_args.length : 0 }.max || 10
-    end
-
-    # Fill task list by loading tasks from the configured adapters and locally.
-    # @return [Object] task_list
-    def fill
-      fill_list_from_adapters
-      fill_list_from_local
-      self
-    end
-
-    # Print the current task list to console.
-    def print
-      list.each do |entry|
-        entry.headline ? print_headline(entry) : print_task_description(entry)
-      end
-    end
-
-    # Extract description from gist's data content string.
-    # @param data [Hash] gist data hash
-    # [String] description string
-    def self.extract_description(task_content)
-      # regex from http://stackoverflow.com/questions/171480/regex-grabbing-values-between-quotation-marks
-      match = task_content.match(/desc (["'])((?:(?!\1)[^\\]|(?:\\\\)*\\[^\\])*)\1/)
-      match && match[2] || 'No description'
-    end
-
-    protected
-
-    def fill_list_from_local
-      list << OpenStruct.new(headline: 'local')
-      Woro::TaskHelper.woro_task_files(config.woro_task_dir) do |file_name, data|
-        list << OpenStruct.new(name_with_args: file_name.split('.rake').first,
-                       comment: Woro::TaskList.extract_description(data))
-      end
-    end
-
-    def fill_list_from_adapters
-      adapter_settings.each do |adapter_setting|
-        list << OpenStruct.new(headline: adapter_setting[0])
-        adapter = config.adapter(adapter_setting[0])
-        files = adapter.list_contents || {}
-        files.map do |file_name, data|
-          if file_name.include? '.rake'
-            list << OpenStruct.new(name_with_args: file_name.split('.rake').first,
-                           comment: adapter.extract_description(data[:data]))
-          end
-        end
-        list.compact!
-      end
-    end
-
-    def adapter_settings
-      config.adapter_settings
-    end
-
-    def print_headline(headline)
-      say "#{headline.headline} ---"
-    end
-
-    def print_task_description(task)
-      say "  %-#{width}s   # %s" % [task.name_with_args, task.comment]
-    end
-  end
-end