localeapp 0.2.0 → 0.3.0

data/.travis.yml

@@ -8,4 +8,3 @@ gemfile:
 branches:
   only:
     - master
-    - develop

data/CHANGELOG.md

@@ -1,4 +1,12 @@
-# HEAD
+# Version 0.3.0
+
+* Allow symbols for environment names in config file
+* `localeapp push` will now push all yaml files in a directory if it's given a
+  directory instead of a file. (Thanks Bartłomiej Danek)
+* Better daemon support. `daemon_pid_file` and `daemon_log_file` configuration
+  options. (Thanks again Bartłomiej Danek)
+
+# Version 0.2.0
 
 * Add `localeapp add` command for sending keys and translations from the command line
 * Add `secure` configuration setting for api communications. Default: true

data/bin/localeapp

@@ -60,17 +60,17 @@ command :pull do |c|
   end
 end
 
-desc "Pushes a translation file to localeapp.com"
+desc "Pushes a translation file or directory to localeapp.com"
 arg_name "<file>"
 command :push do |c|
   c.action do |global_options, options, args|
     if args.empty?
-      exit_now! "localeapp push requires an file to push", 1
+      exit_now! "localeapp push requires an file or directory to push", 1
     else
-      file = args.first
       include_config_file
+      path = args.first
       pusher = Localeapp::CLI::Push.new
-      pusher.execute(file)
+      pusher.execute(path)
     end
   end
 end
@@ -109,11 +109,22 @@ command :daemon do |c|
       end
     end
     if options[:background]
+
+      if File.exists? Localeapp.configuration.daemon_pid_file
+        begin
+          daemon_pid = File.read(Localeapp.configuration.daemon_pid_file)
+          Process.kill("QUIT", daemon_pid.to_i)
+        rescue Errno::ESRCH
+          File.delete(Localeapp.configuration.daemon_pid_file)
+        end
+      end
+
+      STDOUT.reopen(File.open(Localeapp.configuration.daemon_log_file, 'a'))
       pid = fork do
         command.call
       end
-      pids_directory = "tmp/pids"
-      File.open("#{File.directory?(pids_directory) ? pids_directory : "./"}/localeapp.pid", 'w') {|f| f << pid}
+
+      File.open(Localeapp.configuration.daemon_pid_file, 'w') {|f| f << pid}
     else
       command.call
     end

data/features/localeapp_binary.feature

@@ -99,7 +99,7 @@ Feature: localeapp executable
     And help should not be displayed
     And a file named "config/locales/en.yml" should exist
 
-  Scenario: Running push
+  Scenario: Running push on a file
     In order to send my translations
     When I have a valid project on localeapp.com with api key "MYAPIKEY"
     And an initializer file
@@ -109,13 +109,36 @@ Feature: localeapp executable
     """
     Localeapp Push
 
-    Pushing file:
+    Pushing file en.yml:
     Success!
 
     config/locales/en.yml queued for processing.
     """
     And help should not be displayed
 
+  Scenario: Running push on a directory
+    In order to send my translations
+    When I have a valid project on localeapp.com with api key "MYAPIKEY"
+    And an initializer file
+    And an empty file named "config/locales/en.yml"
+    And an empty file named "config/locales/es.yml"
+    When I run `localeapp push config/locales`
+    Then the output should contain:
+    """
+    Localeapp Push
+
+    Pushing file en.yml:
+    Success!
+
+    config/locales/en.yml queued for processing.
+
+    Pushing file es.yml:
+    Success!
+
+    config/locales/es.yml queued for processing.
+    """
+    And help should not be displayed
+
   Scenario: Running update
     In order to receive the translations that have been updated since the last check
     When I have a valid project on localeapp.com with api key "MYAPIKEY"

data/features/support/hooks.rb

@@ -1,3 +1,4 @@
 Before do
   ENV['FAKE_WEB_DURING_CUCUMBER_RUN'] = '1'
+  @aruba_timeout_seconds = 5
 end

data/lib/localeapp/cli/push.rb

@@ -7,15 +7,23 @@ module Localeapp
         @output = output
       end
 
-      def execute(file_path = nil)
+      def execute(path = nil)
         @output.puts "Localeapp Push"
-        @output.puts ""
-
-        @file_path = file_path
+        if path_is_directory?(path)
+          yaml_files_in_directory(path).each do |path|
+            push_file(path)
+          end
+        else
+          push_file(path)
+        end
+      end
 
+      def push_file(file_path)
+        @output.puts ""
+        @file_path = file_path # for callbacks
         file = sanitize_file(file_path)
         if file
-          @output.puts "Pushing file:"
+          @output.puts "Pushing file #{File.basename(file_path)}:"
           api_call :import,
             :payload => { :file => file },
             :success => :report_success,
@@ -44,6 +52,14 @@ module Localeapp
           nil
         end
       end
+
+      def path_is_directory?(path)
+        File.directory?(path)
+      end
+
+      def yaml_files_in_directory(path)
+        Dir.glob(File.join(path, '*.yml')).sort
+      end
     end
   end
 end

data/lib/localeapp/configuration.rb

@@ -1,6 +1,6 @@
 module Localeapp
   class Configuration
-  
+
     # The API key for your project, found on the project edit form
     attr_accessor :api_key
 
@@ -83,6 +83,14 @@ module Localeapp
     # this to RAILS_ROOT/log/localeapp.yml
     attr_accessor :synchronization_data_file
 
+    # The complete path to the pid file where we store information about daemon
+    # default: RAILS_ROOT/tmp/pids/localeapp.pid
+    attr_accessor :daemon_pid_file
+
+    # The complete path to the log file where we store information about daemon actions
+    # default: RAILS_ROOT/log/localeapp_daemon.log
+    attr_accessor :daemon_log_file
+
     # The complete path to the directory where translations are stored
     attr_accessor :translation_data_directory
 
@@ -97,11 +105,13 @@ module Localeapp
       @disabled_sending_environments   = %w(test cucumber production)
       @disabled_reloading_environments = %w(test cucumber production)
       @disabled_polling_environments   = %w(test cucumber production)
-      @sending_environments    = %w(development)
-      @reloading_environments  = %w(development)
-      @polling_environments    = %w(development)
+      @sending_environments            = %w(development)
+      @reloading_environments          = %w(development)
+      @polling_environments            = %w(development)
       @poll_interval                   = 0
       @synchronization_data_file       = File.join('log', 'localeapp.yml')
+      @daemon_pid_file                 = File.join('tmp', 'pids', 'localeapp.pid')
+      @daemon_log_file                 = File.join('log', 'localeapp_daemon.log')
       @translation_data_directory      = File.join('config', 'locales')
       if ENV['DEBUG']
         require 'logger'
@@ -112,27 +122,27 @@ module Localeapp
     def polling_disabled?
       if deprecated_environment_config_used?
         ::Localeapp.log "DEPRECATION: disabled_polling_environments is deprecated and will be removed. Use polling_environments instead and reverse the logic if you've changed the defaults"
-        disabled_polling_environments.include?(environment_name)
+        disabled_polling_environments.map { |v| v.to_s }.include?(environment_name)
       else
-        !polling_environments.include?(environment_name)
+        !polling_environments.map { |v| v.to_s }.include?(environment_name)
       end
     end
 
     def reloading_disabled?
       if deprecated_environment_config_used?
         ::Localeapp.log "DEPRECATION: disabled_reloading_environments is deprecated and will be removed. Use reloading_environments instead and reverse the logic if you've changed the defaults"
-        disabled_reloading_environments.include?(environment_name)
+        disabled_reloading_environments.map { |v| v.to_s }.include?(environment_name)
       else
-        !reloading_environments.include?(environment_name)
+        !reloading_environments.map { |v| v.to_s }.include?(environment_name)
       end
     end
 
     def sending_disabled?
       if deprecated_environment_config_used?
         ::Localeapp.log "DEPRECATION: disabled_sending_environments is deprecated and will be removed. Use sending_environments instead and reverse the logic if you've changed the defaults"
-        disabled_sending_environments.include?(environment_name)
+        disabled_sending_environments.map { |v| v.to_s }.include?(environment_name)
       else
-        !sending_environments.include?(environment_name)
+        !sending_environments.map { |v| v.to_s }.include?(environment_name)
       end
     end
 

data/lib/localeapp/version.rb

@@ -1,3 +1,3 @@
 module Localeapp
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/localeapp.rb

@@ -15,7 +15,7 @@ rescue LoadError
   # This ugliness so we can load AS in the travis env
   # Assume that we're in rails 2.3 and AS supplies deep_merge
   # Load AS if we need to
-  unless @loaded_active_support 
+  unless @loaded_active_support
     # we're in 2.3 and we need to load rails to get the vendored i18n
     require 'thread' # for rubygems > 1.6.0 support
     require 'active_support'
@@ -33,7 +33,7 @@ require 'localeapp/poller'
 require 'localeapp/updater'
 require 'localeapp/key_checker'
 require 'localeapp/missing_translations'
-  
+
 require 'localeapp/cli/install'
 require 'localeapp/cli/pull'
 require 'localeapp/cli/push'
@@ -52,7 +52,7 @@ module Localeapp
   class << self
     # An Localeapp configuration object.
     attr_accessor :configuration
-    
+
     # The sender object is responsible for delivering formatted data to the Localeapp server.
     attr_accessor :sender
 
@@ -80,7 +80,7 @@ module Localeapp
     def logger
       self.configuration && self.configuration.logger
     end
-  
+
     # @example Configuration
     # Localeapp.configure do |config|
     #   config.api_key = '1234567890abcdef'

data/spec/localeapp/cli/push_spec.rb

@@ -1,30 +1,59 @@
 require 'spec_helper'
 
-describe Localeapp::CLI::Push, "#execute(file)" do
-  before do
-    @output = StringIO.new
-    @pusher = Localeapp::CLI::Push.new(@output)
+describe Localeapp::CLI::Push, "#execute(path)" do
+  let(:output) { StringIO.new }
+  let(:pusher) { Localeapp::CLI::Push.new(output) }
+
+  context "path is a directory" do
+    it "calls push_file on each yaml file in the directory" do
+      with_configuration do
+        directory = double('directory')
+        path = 'test_path'
+        yaml_files = %w(en.yml es.yml)
+        pusher.stub!(:path_is_directory?).and_return(true)
+        pusher.should_receive(:yaml_files_in_directory).with(path).and_return(yaml_files)
+        pusher.should_receive(:push_file).with('en.yml')
+        pusher.should_receive(:push_file).with('es.yml')
+        pusher.execute(path)
+      end
+    end
   end
 
+  context "path is a file" do
+    it "calls push_file on the file" do
+      with_configuration do
+        file = double('file')
+        file_path = 'test_path'
+        pusher.should_receive(:push_file).with(file_path)
+        pusher.execute(file_path)
+      end
+    end
+  end
+end
+
+describe Localeapp::CLI::Push, "#push_file(file_path)" do
+  let(:output) { StringIO.new }
+  let(:pusher) { Localeapp::CLI::Push.new(output) }
+
   it "creates a new file object and makes the api call to the translations endpoint" do
     with_configuration do
       file = double('file')
       file_path = 'test_path'
-      @pusher.stub!(:sanitize_file).and_return(file)
-      @pusher.should_receive(:api_call).with(
+      pusher.stub!(:sanitize_file).and_return(file)
+      pusher.should_receive(:api_call).with(
         :import,
         :payload => { :file => file },
         :success => :report_success,
         :failure => :report_failure,
         :max_connection_attempts => 3
       )
-      @pusher.execute(file_path)
+      pusher.push_file(file_path)
     end
   end
 
   it "doesn't make the api call when the file doesn't exist" do
-    @pusher.stub!(:sanitize_file).and_return(nil)
-    @pusher.should_not_receive(:api_call)
-    @pusher.execute('foo')
+    pusher.stub!(:sanitize_file).and_return(nil)
+    pusher.should_not_receive(:api_call)
+    pusher.push_file('foo')
   end
 end

data/spec/localeapp/configuration_spec.rb

@@ -61,6 +61,22 @@ describe Localeapp::Configuration do
     configuration.translation_data_directory.should == "test"
   end
 
+  it "sets the daemon_pid_file by default" do
+    configuration.daemon_pid_file.should == 'tmp/pids/localeapp.pid'
+  end
+
+  it "allows the daemon_pid_file to be overwritten" do
+    expect { configuration.daemon_pid_file = 'foo/la.pid' }.to change(configuration, :daemon_pid_file).to('foo/la.pid')
+  end
+
+  it "sets the daemon_log_file by default" do
+    configuration.daemon_log_file.should == 'log/localeapp_daemon.log'
+  end
+
+  it "allows the daemon_log_file to be overwritten" do
+    expect { configuration.daemon_log_file = 'log/la.log' }.to change(configuration, :daemon_log_file).to('log/la.log')
+  end
+
   context "enabled_sending_environments" do
     it "is only development by default" do
       configuration.sending_environments.should == ['development']
@@ -81,7 +97,7 @@ describe Localeapp::Configuration do
 
   context "disabled_sending_environments" do
     it "sets deprecated_environment_config_used flag to true" do
-      configuration.disabled_sending_environments = %(foo bar)
+      configuration.disabled_sending_environments = %w(foo bar)
       configuration.deprecated_environment_config_used?.should be_true
     end
 
@@ -108,7 +124,7 @@ describe Localeapp::Configuration do
 
   context "disabled_reloading_environments" do
     it "sets deprecated_environment_config_used flag to true" do
-      configuration.disabled_reloading_environments = %(foo bar)
+      configuration.disabled_reloading_environments = %w(foo bar)
       configuration.deprecated_environment_config_used?.should be_true
     end
 
@@ -135,7 +151,7 @@ describe Localeapp::Configuration do
   
   context "disabled_polling_environments" do
     it "sets deprecated_environment_config_used flag to true" do
-      configuration.disabled_polling_environments = %(foo bar)
+      configuration.disabled_polling_environments = %w(foo bar)
       configuration.deprecated_environment_config_used?.should be_true
     end
 
@@ -163,27 +179,39 @@ describe Localeapp::Configuration do
   describe "polling_disabled?" do
     context "deprecated syntax used" do
       it "is true when environment is disabled" do
-        configuration.disabled_polling_environments = %(foo)
+        configuration.disabled_polling_environments = %w(foo)
         configuration.environment_name = 'foo'
         configuration.should be_polling_disabled
       end
 
       it "is false when environment is not disabled" do
-        configuration.disabled_polling_environments = %(foo)
+        configuration.disabled_polling_environments = %w(foo)
         configuration.environment_name = 'bar'
         configuration.should_not be_polling_disabled
       end
+
+      it "supports symbols in list of environments" do
+        configuration.disabled_polling_environments = [:foo]
+        configuration.environment_name = 'foo'
+        configuration.should be_polling_disabled
+      end
     end
 
     context "new syntax used" do
       it "is true when environment is not enabled" do
-        configuration.polling_environments = %(foo)
+        configuration.polling_environments = %w(foo)
         configuration.environment_name = 'bar'
         configuration.should be_polling_disabled
       end
 
       it "is false when environment is enabled" do
-        configuration.polling_environments = %(foo)
+        configuration.polling_environments = %w(foo)
+        configuration.environment_name = 'foo'
+        configuration.should_not be_polling_disabled
+      end
+
+      it "supports symbols in list of environments" do
+        configuration.polling_environments = [:foo]
         configuration.environment_name = 'foo'
         configuration.should_not be_polling_disabled
       end
@@ -193,27 +221,39 @@ describe Localeapp::Configuration do
   describe "reloading_disabled?" do
     context "deprecated syntax used" do
       it "is true when environment is disabled" do
-        configuration.disabled_reloading_environments = %(foo)
+        configuration.disabled_reloading_environments = %w(foo)
         configuration.environment_name = 'foo'
         configuration.should be_reloading_disabled
       end
 
       it "is false when environment is not disabled" do
-        configuration.disabled_reloading_environments = %(foo)
+        configuration.disabled_reloading_environments = %w(foo)
         configuration.environment_name = 'bar'
         configuration.should_not be_reloading_disabled
       end
+
+      it "supports symbols in list of environments" do
+        configuration.disabled_reloading_environments = [:foo]
+        configuration.environment_name = 'foo'
+        configuration.should be_reloading_disabled
+      end
     end
 
     context "new syntax used" do
       it "is true when environment is not enabled" do
-        configuration.reloading_environments = %(foo)
+        configuration.reloading_environments = %w(foo)
         configuration.environment_name = 'bar'
         configuration.should be_reloading_disabled
       end
 
       it "is false when environment is enabled" do
-        configuration.reloading_environments = %(foo)
+        configuration.reloading_environments = %w(foo)
+        configuration.environment_name = 'foo'
+        configuration.should_not be_reloading_disabled
+      end
+
+      it "supports symbols in list of environments" do
+        configuration.reloading_environments = [:foo]
         configuration.environment_name = 'foo'
         configuration.should_not be_reloading_disabled
       end
@@ -223,27 +263,39 @@ describe Localeapp::Configuration do
   describe "sending_disabled?" do
     context "deprecated syntax used" do
       it "is true when environment is disabled" do
-        configuration.disabled_sending_environments = %(foo)
+        configuration.disabled_sending_environments = %w(foo)
         configuration.environment_name = 'foo'
         configuration.should be_sending_disabled
       end
 
       it "is false when environment is not disabled" do
-        configuration.disabled_sending_environments = %(foo)
+        configuration.disabled_sending_environments = %w(foo)
         configuration.environment_name = 'bar'
         configuration.should_not be_sending_disabled
       end
+
+      it "supports symbols in the list of enviroments" do
+        configuration.disabled_sending_environments = [:foo]
+        configuration.environment_name = 'foo'
+        configuration.should be_sending_disabled
+      end
     end
 
     context "new syntax used" do
       it "is true when environment is not enabled" do
-        configuration.sending_environments = %(foo)
+        configuration.sending_environments = %w(foo)
         configuration.environment_name = 'bar'
         configuration.should be_sending_disabled
       end
 
       it "is false when environment is enabled" do
-        configuration.sending_environments = %(foo)
+        configuration.sending_environments = %w(foo)
+        configuration.environment_name = 'foo'
+        configuration.should_not be_sending_disabled
+      end
+
+      it "supports symbols in the list of environments" do
+        configuration.sending_environments = [:foo]
         configuration.environment_name = 'foo'
         configuration.should_not be_sending_disabled
       end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: localeapp
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: 
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Christopher Dell
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-17 00:00:00 Z
+date: 2011-11-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: i18n