localeapp 0.3.0 → 0.3.1

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# Version 0.3.1
+
+* Handle SocketError so we don't cause errors in client apps when they're not
+  connected to the network
+* Fix bug with empty log file (Thanks Robin Mehner)
+
 # Version 0.3.0
 
 * Allow symbols for environment names in config file

data/features/localeapp_binary.feature

@@ -5,7 +5,7 @@ Feature: localeapp executable
     When I run `localeapp help`
     Then the output should contain:
     """
-    usage: localeapp command [command options]
+    usage: localeapp [global options] command [command options]
     """
 
   Scenario: Running a command that doesn't exist

data/lib/localeapp/api_caller.rb

@@ -70,6 +70,9 @@ module Localeapp
       rescue Errno::ECONNREFUSED => error
         Localeapp.debug("ERROR: Connection Refused")
         return NonHTTPResponse.new(-1)
+      rescue SocketError => error
+        Localeapp.debug("ERROR: Socket Error #{error.message}")
+        return NonHTTPResponse.new(-1)
       end
     end
 

data/lib/localeapp/poller.rb

@@ -19,7 +19,7 @@ module Localeapp
 
     def synchronization_data
       if File.exists?(Localeapp.configuration.synchronization_data_file)
-        YAML.load_file(Localeapp.configuration.synchronization_data_file)
+        YAML.load_file(Localeapp.configuration.synchronization_data_file) || {}
       else
         {}
       end

data/lib/localeapp/version.rb

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

data/spec/localeapp/api_caller_spec.rb

@@ -199,7 +199,14 @@ describe Localeapp::ApiCaller, "#call(object)" do
     end
 
     it "handles ECONNREFUSED" do
-      RestClient.stub(:send).and_raise(Errno::ECONNREFUSED)
+      RestClient::Request.stub(:execute).and_raise(Errno::ECONNREFUSED)
+      @api_caller.options[:failure] = :fail
+      @object.should_receive(:fail)
+      @api_caller.call(@object)
+    end
+
+    it "handles SocketError" do
+      RestClient::Request.stub(:execute).and_raise(SocketError)
       @api_caller.options[:failure] = :fail
       @object.should_receive(:fail)
       @api_caller.call(@object)

data/spec/localeapp/poller_spec.rb

@@ -24,6 +24,21 @@ describe Localeapp::Poller do
     end
   end
 
+  describe "#synchronization_data" do
+    before do
+      @original_configuration_file = Localeapp.configuration.synchronization_data_file
+      Localeapp.configuration.synchronization_data_file = "#{File.dirname(__FILE__)}/../fixtures/empty_log.yml"
+    end
+
+    it "returns an empty hash if there is a yml file that is empty" do
+      @poller.synchronization_data.should == {}
+    end
+
+    after do
+      Localeapp.configuration.synchronization_data_file = @original_configuration_file
+    end
+  end
+
   describe "#write_synchronization_data!(polled_at, updated_at)" do
     it "updates polled_at in the synchronization file" do
       polled_at = lambda { @poller.synchronization_data[:polled_at] }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: localeapp
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Christopher Dell
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-18 00:00:00 Z
+date: 2011-12-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: i18n
@@ -237,6 +237,7 @@ files:
 - lib/localeapp/version.rb
 - localeapp.gemspec
 - run_ci
+- spec/fixtures/empty_log.yml
 - spec/fixtures/en.yml
 - spec/fixtures/es.yml
 - spec/localeapp/api_call_spec.rb
@@ -297,6 +298,7 @@ test_files:
 - features/step_definitions/cli_steps.rb
 - features/support/env.rb
 - features/support/hooks.rb
+- spec/fixtures/empty_log.yml
 - spec/fixtures/en.yml
 - spec/fixtures/es.yml
 - spec/localeapp/api_call_spec.rb