flare-up 0.6 → 0.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OWIzMWE3OTM0ZWNkMDFkZGQyMzY4ODdmMTQ3MzVlMDI5MzA1YTgzZg==
+    YTIzMzhkOTUyZjYwNzUyMzYyYTUxYTEwZGJlZmY1ODdmNWJkYjUzMw==
   data.tar.gz: !binary |-
-    N2M1NTg4OGZlMDUyNTVhYWJkOTZlZDA2ZWQzYmY3MDA5YTNlOGQwMw==
+    NDJiMGI4OWQ2ZjMyNWQ2MDQ4NmRjZWY4MjVkNTllY2I1NWJkYmVkOA==
 SHA512:
   metadata.gz: !binary |-
-    NzkyMmYwZjdhMjYzNWVhN2IwNDg1N2Y0OTg5MmI5M2IyMTQyNjkzZTc5ODI4
-    M2MzY2FiN2Y4M2U2OGNkYzdkM2FiNzZjZmI1OTA2ZjE4ODNmNjQ0NzY4Y2Zh
-    NWI2NDBlMDQ4NjNhYmRmNzg5NzUxNjNhNjYzYzUzZDcyYTYwYWI=
+    YTdiYjFkMmFmODI0MTNkYzgyZjAyY2UyNGNkMzM0ZDljMDgxNjNjMjJiNjQx
+    ZmM5ZTZiOGI0NDMyZjZhM2VmZGUwMGJkYTg5M2EwM2EzOTFiMTY5ZDBkYjU2
+    ZjAxODg1YTFiZTIxNDk4NWVjZmQ3YzJhZjAwNjk5YWM4ZjUxZmY=
   data.tar.gz: !binary |-
-    OGQzYjRiN2JlNTM3Y2NmMjMxNWU0NGE3ZTg1ZjY1MjAwMDU4MzU4NzFiNjNh
-    MjJjMjZlMmFkZmE5ZWIyNGNjNWFmYjk0YTUwOTU2ZDM3ZmJlYTMzYjcwZWNh
-    NDVkNjQ4MDdmNjZkZmZkMTI2YWJkZDI3MjVmYTE4OTc5NGYzMmI=
+    MTFkMTlkOTliMGM0YTMxZDExZjRhNmJlMTA5NGMwODFmM2I3MzM0ZTQ5YTYw
+    ZTc4N2VlYjQxZTRkZmEwMTdlYjdjM2E5MjZjNTA0YTczNzVkY2Y1MDVlNDEx
+    M2VhNDcyZjI1MzU4NmVlNTIzMjZlMTE0OWU0MzViMzdmMWQzNTI=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    flare-up (0.6)
+    flare-up (0.7)
       pg (~> 0.17)
       thor (~> 0.19)
 

data/README.md

@@ -50,5 +50,5 @@ Note that this example assumes you have credentials set as environment variables
     dev                                                         \
     hearthstone_cards                                           \
     --column-list name cost attack health description           \
-    --copy_options "REGION 'us-east-1' CSV"
+    --copy-options "REGION 'us-east-1' CSV"
 ```

data/lib/flare_up/boot.rb

@@ -2,14 +2,28 @@ module FlareUp
 
   class Boot
 
-    # TODO: This control flow is untested
+    # TODO: This control flow is untested and too procedural
     def self.boot(options)
       conn = create_connection(options)
       copy = create_copy_command(options)
 
       begin
+        trap('SIGINT') do
+          Emitter.warn('CTRL-C received; cancelling COPY command...')
+          error_message = conn.cancel_current_command
+          if error_message
+            Emitter.error("Error cancelling COPY: #{error_message}")
+          else
+            Emitter.success('COPY command cancelled.')
+          end
+          CLI.bailout(1)
+        end
+
         Emitter.info("Executing command: #{copy.get_command}")
         handle_load_errors(copy.execute(conn))
+      rescue ConnectionError => e
+        Emitter.error(e.message)
+        CLI.bailout(1)
       rescue CopyCommandError => e
         Emitter.error(e.message)
         CLI.bailout(1)

data/lib/flare_up/connection.rb

@@ -1,14 +1,16 @@
 module FlareUp
 
-  class HostUnknownOrInaccessibleError < StandardError
+  class ConnectionError < StandardError
   end
-  class TimeoutError < StandardError
+  class HostUnknownOrInaccessibleError < ConnectionError
   end
-  class NoDatabaseError < StandardError
+  class TimeoutError < ConnectionError
   end
-  class AuthenticationError < StandardError
+  class NoDatabaseError < ConnectionError
   end
-  class UnknownError < StandardError
+  class AuthenticationError < ConnectionError
+  end
+  class UnknownError < ConnectionError
   end
 
   class Connection
@@ -30,15 +32,20 @@ module FlareUp
       @connect_timeout = 5
     end
 
-    # TODO - Not quite sure how to test this; perhaps fold connect/execute into
-    # TODO   one method so we can close connections in case of failure, etc.
     def execute(statement)
-      @pg_conn ||= connect
-      @pg_conn.exec(statement)
+      connection.async_exec(statement)
+    end
+
+    def cancel_current_command
+      connection.cancel
     end
 
     private
 
+    def connection
+      @pg_conn ||= connect
+    end
+
     def connect
       begin
         PG.connect(connection_parameters)
@@ -53,11 +60,12 @@ module FlareUp
           when /password authentication failed for user/
             raise AuthenticationError, "Either username '#{@user}' or password invalid"
           else
-            raise UnknownError
+            raise UnknownError, e.message
         end
       end
     end
 
+    # http://www.postgresql.org/docs/9.3/static/libpq-connect.html#LIBPQ-PARAMKEYWORDS
     def connection_parameters
       {
         :host => @host,
@@ -65,7 +73,17 @@ module FlareUp
         :dbname => @dbname,
         :user => @user,
         :password => @password,
-        :connect_timeout => @connect_timeout
+        :connect_timeout => @connect_timeout,
+        # Enable keep-alives
+        :keepalives => 1,
+        # Idle time in between keep-alives when there is a response from the peer
+        :keepalives_idle => 30,
+        # Interval between keep-alives when there is no response from the peer
+        # This is done to probe the peer until there is a response
+        :keepalives_interval => 10,
+        # Number of keep-alives that can be lost before the client's connection
+        # to the server is considered dead
+        :keepalives_count => 3
       }
     end
 

data/lib/flare_up/emitter.rb

@@ -14,6 +14,16 @@ module FlareUp
       $stderr.puts sanitize("\x1b[31m#{message}") unless ENV['TESTING']
     end
 
+    # TODO: How do we test this?
+    def self.success(message)
+      $stdout.puts sanitize("\x1b[32m#{message}") unless ENV['TESTING']
+    end
+
+    # TODO: How do we test this?
+    def self.warn(message)
+      $stdout.puts sanitize("\x1b[33m#{message}") unless ENV['TESTING']
+    end
+
     # TODO: How do we test this?
     def self.info(message)
       $stdout.puts sanitize(message) unless ENV['TESTING']

data/lib/flare_up/version.rb

@@ -1,3 +1,3 @@
 module FlareUp
-  VERSION = '0.6'
+  VERSION = '0.7'
 end

data/spec/lib/flare_up/boot_spec.rb

@@ -1,13 +1,15 @@
 describe FlareUp::Boot do
 
   describe '.boot' do
+    let(:connection) { instance_double('FlareUp::Connection') }
     let(:copy_command) { instance_double('FlareUp::CopyCommand') }
 
     before do
       allow(copy_command).to receive(:get_command)
     end
 
-    context 'when there is an error' do
+    context 'when there is an error connecting' do
+
       before do
         expect(FlareUp::Boot).to receive(:create_copy_command).and_return(copy_command)
         expect(copy_command).to receive(:execute).and_raise(copy_command_error)
@@ -39,6 +41,55 @@ describe FlareUp::Boot do
 
     end
 
+    context 'when there is an error copying' do
+
+      before do
+        expect(FlareUp::Boot).to receive(:create_connection).and_return(connection)
+        expect(connection).to receive(:execute).and_raise(connection_error)
+      end
+
+      context 'when there is a HostUnknownOrInaccessibleError' do
+        let(:connection_error) { FlareUp::HostUnknownOrInaccessibleError }
+        it 'should handle the error' do
+          expect(FlareUp::CLI).to receive(:bailout).with(1)
+          expect { FlareUp::Boot.boot({}) }.not_to raise_error
+        end
+      end
+
+      context 'when there is a TimeoutError' do
+        let(:connection_error) { FlareUp::TimeoutError }
+        it 'should handle the error' do
+          expect(FlareUp::CLI).to receive(:bailout).with(1)
+          expect { FlareUp::Boot.boot({}) }.not_to raise_error
+        end
+      end
+
+      context 'when there is a NoDatabaseError' do
+        let(:connection_error) { FlareUp::NoDatabaseError }
+        it 'should handle the error' do
+          expect(FlareUp::CLI).to receive(:bailout).with(1)
+          expect { FlareUp::Boot.boot({}) }.not_to raise_error
+        end
+      end
+
+      context 'when there is a AuthenticationError' do
+        let(:connection_error) { FlareUp::AuthenticationError }
+        it 'should handle the error' do
+          expect(FlareUp::CLI).to receive(:bailout).with(1)
+          expect { FlareUp::Boot.boot({}) }.not_to raise_error
+        end
+      end
+
+      context 'when there is a UnknownError' do
+        let(:connection_error) { FlareUp::UnknownError }
+        it 'should handle the error' do
+          expect(FlareUp::CLI).to receive(:bailout).with(1)
+          expect { FlareUp::Boot.boot({}) }.not_to raise_error
+        end
+      end
+
+    end
+
   end
 
   describe '.create_connection' do

data/spec/lib/flare_up/connection_spec.rb

@@ -4,6 +4,8 @@ describe FlareUp::Connection do
     FlareUp::Connection.new('TEST_HOST', 'TEST_DB_NAME', 'TEST_USER', 'TEST_PASSWORD')
   end
 
+  let(:mock_pg_connection) { instance_double('PGConn') }
+
   its(:host) { should == 'TEST_HOST' }
   its(:port) { should == 5439 }
   its(:dbname) { should == 'TEST_DB_NAME' }
@@ -97,7 +99,6 @@ describe FlareUp::Connection do
   end
 
   describe '#connection_parameters' do
-
     it 'should return the required parameters' do
       expect(subject.send(:connection_parameters)).to eq({
         :host => 'TEST_HOST',
@@ -106,9 +107,32 @@ describe FlareUp::Connection do
         :user => 'TEST_USER',
         :password => 'TEST_PASSWORD',
         :connect_timeout => 5,
+        :keepalives => 1,
+        :keepalives_idle => 30,
+        :keepalives_interval => 10,
+        :keepalives_count => 3
       })
     end
+  end
 
+  describe '#execute' do
+    before do
+      allow(subject).to receive(:connect).and_return(mock_pg_connection)
+    end
+    it 'should execute the specified command' do
+      expect(mock_pg_connection).to receive(:async_exec).with('TEST_STATEMENT')
+      subject.execute('TEST_STATEMENT')
+    end
+  end
+
+  describe '#cancel_current_command' do
+    before do
+      allow(subject).to receive(:connect).and_return(mock_pg_connection)
+    end
+    it 'should execute the specified command' do
+      expect(mock_pg_connection).to receive(:cancel)
+      subject.cancel_current_command
+    end
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flare-up
 version: !ruby/object:Gem::Version
-  version: '0.6'
+  version: '0.7'
 platform: ruby
 authors:
 - Robert Slifka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-12 00:00:00.000000000 Z
+date: 2014-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg