flare-up 0.3 → 0.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NmI5NGU5NTk4NjAzNDE1ODY4YTQ1ODRjNGVhZmZjYjFkNjlhYjEzNQ==
+    MDY0ZDc2M2NlMjg4ZjQ2YzllZGYyNTkxYWI0ZGRkMDE4N2I2OTJhNQ==
   data.tar.gz: !binary |-
-    YzhiOTAyMDk5YTlmODg3NmJlM2M5OWI5ZWYyOTJjMzZjMDdhZmI5ZA==
+    ZWZjNmM0NDAyMDY2NjU0YThiYzAwNDljODAzODllMzlhYzcyNmMwZg==
 SHA512:
   metadata.gz: !binary |-
-    ZDQ1MjFiZjkyMGU1MTUyYjU2ZTVlYjQyNzAyMGYwMmM0MGVhYmZkMWM3NzFj
-    NDI0NmRmOGYwNDdiYWYwZTNhODBiZmZkZDVhYmUxNzhlODlkMGNlYTAzY2Nk
-    NmQ1MzFjMWQwODY1YjliMzM3NTkxNjY1ODRjYTlhN2Y4YjllY2Q=
+    NTYyMDZiYzBlZDY3YjcyMzdiZTVhYjZiZmUzYWIzYmM4NWM0NzAxODRmYjcz
+    NDdiODM2NzdhMWMzMTFkZmIzYmVmNWY2Njg0MmIwYTRiZjRkOTNjOWMyZjcw
+    NjAxM2MxNDU4NmJjNjJlZWI0MGI2NmI0MzlmNDZmZDM4YTZjMzQ=
   data.tar.gz: !binary |-
-    YjRlOGVmMGFjYzdiYTUyMWU3NTlhODcwNmM2NTc1NTJhNjU3MjBmYzZhY2Jj
-    ZTAwNmU4NzgwZGJkMmFjMDE3MTc5YTllOGFkOTVjMjkyZTc1MjEyMjkyZTA2
-    MjU2YjFhOGJhZTYzMGJhNTg2ODhiY2MwZTM4NGM1YmE5YmJmYTg=
+    MDExZjBkNmNlOGExNTU5YWY4ZTFhZjI3ZjdmNDUxY2Y1NDE3ZDc4ZTdiYjVk
+    MjlmZjlhNWUyM2JjMjNkMDIyZTYxNGI3MTUzM2Q4OTdmMzVhNGJhMzZkNWY5
+    MjBlNTU0ZDA1YTI1YTIzMWIwNjNkNWUwZjlhYWRlYTJmNzllN2M=

data/Gemfile.lock

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

data/README.md

@@ -28,12 +28,14 @@ Usage:
   flare-up copy DATA_SOURCE REDSHIFT_ENDPOINT DATABASE TABLE
 
 Options:
-  [--aws-access-key=AWS_ACCESS_KEY]        # Required unless ENV['AWS_ACCESS_KEY_ID'] is set.
-  [--aws-secret-key=AWS_SECRET_KEY]        # Required unless ENV['AWS_SECRET_ACCESS_KEY'] is set.
-  [--redshift-username=REDSHIFT_USERNAME]  # Required unless ENV['REDSHIFT_USERNAME'] is set.
-  [--redshift-password=REDSHIFT_PASSWORD]  # Required unless ENV['REDSHIFT_PASSWORD'] is set.
-  [--column-list=one two three]            # A space-separated list of columns, should your DATA_SOURCE require it
-  [--copy-options=COPY_OPTIONS]            # Appended to the end of the COPY command; enclose "IN QUOTES"
+  [--aws-access-key=AWS_ACCESS_KEY]            # Required unless ENV['AWS_ACCESS_KEY_ID'] is set.
+  [--aws-secret-key=AWS_SECRET_KEY]            # Required unless ENV['AWS_SECRET_ACCESS_KEY'] is set.
+  [--redshift-username=REDSHIFT_USERNAME]      # Required unless ENV['REDSHIFT_USERNAME'] is set.
+  [--redshift-password=REDSHIFT_PASSWORD]      # Required unless ENV['REDSHIFT_PASSWORD'] is set.
+  [--column-list=one two three]                # A space-separated list of columns, should your DATA_SOURCE require it
+  [--copy-options=COPY_OPTIONS]                # Appended to the end of the COPY command; enclose "IN QUOTES"
+  [--colorize-output], [--no-colorize-output]  # Should Flare-up colorize its output?
+                                               # Default: true
 ```
 
 ## Sample Usage

data/lib/flare_up.rb

@@ -2,6 +2,7 @@ require 'pg'
 require 'thor'
 
 require 'flare_up/env_wrap'
+require 'flare_up/emitter'
 
 require 'flare_up/connection'
 require 'flare_up/stl_load_error'

data/lib/flare_up/boot.rb

@@ -8,9 +8,10 @@ module FlareUp
       copy = create_copy_command(options)
 
       begin
+        Emitter.info("Executing command: #{copy.get_command}")
         handle_load_errors(copy.execute(conn))
       rescue CopyCommandError => e
-        CLI.output_error("\x1b[31m#{e.message}")
+        Emitter.error(e.message)
         CLI.bailout(1)
       end
 
@@ -40,10 +41,11 @@ module FlareUp
     # TODO: How can we test this?
     def self.handle_load_errors(stl_load_errors)
       return if stl_load_errors.empty?
-      puts "\x1b[31mThere was an error processing the COPY command.  Displaying the last (#{stl_load_errors.length}) errors."
+      Emitter.error("There was an error processing the COPY command.  Displaying the last (#{stl_load_errors.length}) errors.")
       stl_load_errors.each do |e|
-        puts e.pretty_print
+        Emitter.error(e.pretty_print)
       end
+      CLI.bailout(1)
     end
 
   end

data/lib/flare_up/cli.rb

@@ -16,6 +16,7 @@ https://github.com/sharethrough/flare-up/blob/v#{FlareUp::VERSION}/README.md
     option :redshift_password, :type => :string, :desc => "Required unless ENV['REDSHIFT_PASSWORD'] is set."
     option :column_list, :type => :array, :desc => 'A space-separated list of columns, should your DATA_SOURCE require it'
     option :copy_options, :type => :string, :desc => "Appended to the end of the COPY command; enclose \"IN QUOTES\""
+    option :colorize_output, :type => :boolean, :desc => 'Should Flare-up colorize its output?', :default => true
 
     def copy(data_source, endpoint, database_name, table_name)
       boot_options = {
@@ -32,10 +33,11 @@ https://github.com/sharethrough/flare-up/blob/v#{FlareUp::VERSION}/README.md
         CLI.env_validator(boot_options, :redshift_username, 'REDSHIFT_USERNAME')
         CLI.env_validator(boot_options, :redshift_password, 'REDSHIFT_PASSWORD')
       rescue ArgumentError => e
-        CLI.output_error(e.message)
+        Emitter.error(e.message)
         CLI.bailout(1)
       end
 
+      Emitter.store_options(boot_options)
       Boot.boot(boot_options)
     end
 
@@ -50,11 +52,6 @@ https://github.com/sharethrough/flare-up/blob/v#{FlareUp::VERSION}/README.md
       exit(1)
     end
 
-    # TODO: Extract
-    def self.output_error(message)
-      puts "\x1b[31m#{message}" unless ENV['TESTING']
-    end
-
   end
 
 end

data/lib/flare_up/emitter.rb

@@ -0,0 +1,38 @@
+module FlareUp
+
+  class Emitter
+
+    RISKY_OPTIONS = [
+      :aws_access_key,
+      :aws_secret_key,
+      :redshift_username,
+      :redshift_password
+    ]
+
+    # TODO: How do we test this?
+    def self.error(message)
+      $stderr.puts sanitize("\x1b[31m#{message}") unless ENV['TESTING']
+    end
+
+    # TODO: How do we test this?
+    def self.info(message)
+      $stdout.puts sanitize(message) unless ENV['TESTING']
+    end
+
+    # TODO: How do we test this?
+    def self.sanitize(message)
+      RISKY_OPTIONS.each do |risky_option|
+        message.gsub!(@BOOT_OPTIONS[risky_option], 'REDACTED')
+      end
+      message.gsub!(/\e\[(\d+)(;\d+)*m/, '') unless @BOOT_OPTIONS[:colorize_output]
+      message
+    end
+
+    # TODO: How do we test this?
+    def self.store_options(options)
+      @BOOT_OPTIONS = options
+    end
+
+  end
+
+end

data/lib/flare_up/stl_load_error_fetcher.rb

@@ -3,7 +3,7 @@ module FlareUp
   class STLLoadErrorFetcher
 
     def self.fetch_errors(connection)
-      query_result = connection.execute('SELECT * FROM stl_load_errors ORDER BY query DESC, line_number, position LIMIT 3')
+      query_result = connection.execute('SELECT * FROM stl_load_errors ORDER BY query DESC, line_number, position LIMIT 1')
       errors = []
       query_result.each do |row|
         errors << STLLoadError.from_pg_results_row(row)

data/lib/flare_up/version.rb

@@ -1,3 +1,3 @@
 module FlareUp
-  VERSION = '0.3'
+  VERSION = '0.4'
 end

data/spec/lib/flare_up/boot_spec.rb

@@ -3,6 +3,10 @@ describe FlareUp::Boot do
   describe '.boot' do
     let(:copy_command) { instance_double('FlareUp::CopyCommand') }
 
+    before do
+      allow(copy_command).to receive(:get_command)
+    end
+
     context 'when there is an error' do
       before do
         expect(FlareUp::Boot).to receive(:create_copy_command).and_return(copy_command)

data/spec/lib/flare_up/cli_spec.rb

@@ -10,7 +10,8 @@ describe FlareUp::CLI do
       :redshift_username => 'TEST_REDSHIFT_USERNAME',
       :redshift_password => 'TEST_REDSHIFT_PASSWORD',
       :aws_access_key => 'TEST_AWS_ACCESS_KEY',
-      :aws_secret_key => 'TEST_AWS_SECRET_KEY'
+      :aws_secret_key => 'TEST_AWS_SECRET_KEY',
+      :colorize_output => true
     }
   end
 
@@ -24,6 +25,11 @@ describe FlareUp::CLI do
 
   describe '#copy' do
 
+    it 'should pass the options on the emitter' do
+      expect(FlareUp::Emitter).to receive(:store_options).with(required_options)
+      FlareUp::CLI.start(required_arguments)
+    end
+
     context 'when no options are specified' do
       it 'should boot with the proper options' do
         expect(FlareUp::Boot).to receive(:boot).with(required_options)
@@ -45,6 +51,24 @@ describe FlareUp::CLI do
       end
     end
 
+    describe 'colorizing output' do
+
+      context 'when it is not specified' do
+        it 'should boot with the proper options' do
+          expect(FlareUp::Boot).to receive(:boot).with(required_options.merge(:colorize_output => true))
+          FlareUp::CLI.start(required_arguments)
+        end
+      end
+
+      context 'when it is specified' do
+        it 'should boot with the proper options' do
+          expect(FlareUp::Boot).to receive(:boot).with(required_options.merge(:colorize_output => false))
+          FlareUp::CLI.start(required_arguments + ['--colorize_output=false'])
+        end
+      end
+
+    end
+
     describe 'Redshift credentials' do
 
       describe 'username' do

data/spec/lib/flare_up/emitter_spec.rb

@@ -0,0 +1,3 @@
+describe FlareUp::Emitter do
+
+end

data/spec/lib/flare_up/stl_load_error_fetcher_spec.rb

@@ -6,7 +6,7 @@ describe FlareUp::STLLoadErrorFetcher do
 
     before do
       expect(connection).to receive(:execute).
-        with('SELECT * FROM stl_load_errors ORDER BY query DESC, line_number, position LIMIT 3').
+        with('SELECT * FROM stl_load_errors ORDER BY query DESC, line_number, position LIMIT 1').
         and_return([
         {
           'err_reason' => 'TEST_REASON',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flare-up
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: '0.4'
 platform: ruby
 authors:
 - Robert Slifka
@@ -104,6 +104,7 @@ files:
 - lib/flare_up/cli.rb
 - lib/flare_up/connection.rb
 - lib/flare_up/copy_command.rb
+- lib/flare_up/emitter.rb
 - lib/flare_up/env_wrap.rb
 - lib/flare_up/stl_load_error.rb
 - lib/flare_up/stl_load_error_fetcher.rb
@@ -117,6 +118,7 @@ files:
 - spec/lib/flare_up/cli_spec.rb
 - spec/lib/flare_up/connection_spec.rb
 - spec/lib/flare_up/copy_command_spec.rb
+- spec/lib/flare_up/emitter_spec.rb
 - spec/lib/flare_up/stl_load_error_fetcher_spec.rb
 - spec/lib/flare_up/stl_load_error_spec.rb
 - spec/spec_helper.rb
@@ -148,6 +150,7 @@ test_files:
 - spec/lib/flare_up/cli_spec.rb
 - spec/lib/flare_up/connection_spec.rb
 - spec/lib/flare_up/copy_command_spec.rb
+- spec/lib/flare_up/emitter_spec.rb
 - spec/lib/flare_up/stl_load_error_fetcher_spec.rb
 - spec/lib/flare_up/stl_load_error_spec.rb
 - spec/spec_helper.rb