mode 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03a5f9840967c0b0a7b461ff7ebbef1ceee872f6
-  data.tar.gz: d207b4e636caaf13e1c43ae76aa86e556aba7825
+  metadata.gz: e7d69ae05d944f46182074adaa084e4b22454862
+  data.tar.gz: 111e422dca6963652e892f4543f6b91d13d4bf1e
 SHA512:
-  metadata.gz: da0837b3b8b33c55de80fba1d1ecfc2b16dc47831658f5fee2da7387bff8fba4ea6022a3732b30b020fe8379a66624a8bfd9b53e31d006850eba8a17a3301fda
-  data.tar.gz: 2aff0e732ef9fa57dfec9702e41b14c3377a6a8fe3eded36e05c17c0d7e4a0ae82102b8cab4778878a0b6f8bfaee7d724987ec7f045e92a8cb7a789a70a81243
+  metadata.gz: f33ca37d31a1966328a8dadaef02eb0337aac0fcd28be3473b8d21ee50f777023132cfa886641a96b97804bc6d18e640c1bc3f6f101b9d7cc6344158f30a3acd
+  data.tar.gz: df765cb61dd992ec67ce3cd3fe11a04a65d8d45927ca0cb43a6ffa338a487211e5421e2fd24525e53d8c962671597bb34280b54c8ddf2eb594e6b39a5777502d

data/lib/mode/cli/connect.rb

@@ -1,11 +1,20 @@
 module Mode
   module CLI
     class Base < Thor
-      desc "connect start|stop|restart [-c CONCURRENCY]", "Connect external databases to Mode"
+      desc "connect COMMAND [-c CONCURRENCY]", "Connect external databases to Mode"
+      long_desc <<-LONGDESC
+        The connect command allows you to connect external databases to Mode's cloud tools.
+        This will make the data in these databases queryable and the schemas indexed and searchable.
+
+        Support values for COMMAND: start, stop, restart, status, verify
+      LONGDESC
       option :concurrency, :aliases => :c, :default => 4
       option :host, :default => 'www.modeanalytics.com'
-      def connect(command)
-        if ['start', 'stop', 'restart'].include?(command)
+      def connect(command = 'start')
+        if command == 'verify'
+          Mode::Commands::Connect.new(command, options).verify!
+          say "Success! All config and connectivity checks passed"
+        elsif ['start', 'status', 'stop', 'restart'].include?(command)
           Mode::Commands::Connect.new(command, options).execute
         else
           say "Error: valid commands for connect are start, stop and restart"

data/lib/mode/commands/connect.rb

@@ -6,31 +6,44 @@ module Mode
 
       attr_reader :command
       attr_reader :concurrency
-      attr_reader :configuration
 
       def initialize(command, options = {})
         @command = command
         @concurrency = options[:concurrency] || 4
-
-        validate!
-
-        @configuration = Mode::Connector::Config.new(config_dir)
       end
 
       def execute
+        validate_config!
         register! if ['start', 'restart'].include?(command)
         spawn!
       end
 
+      def verify!
+        validate_config!
+        configuration.data_sources.each do |data_source|
+          begin
+            unless data_source.connection.test_connection
+              raise StandardError.new("Unknown connection error")
+            end
+          rescue => err
+            raise "Error: Cannot connect to #{data_source.name}. #{err.message}"
+          end
+        end
+      end
+
       private
 
-      def validate!
+      def validate_config!
         require_config!
         require_credentials!
         require_connect_config!
         configure_api_requests!
       end
 
+      def configuration
+        @configuration ||= Mode::Connector::Config.new(config_dir)
+      end
+
       def register!
         Mode::Connector::Registrar.new(configuration).perform!
       end
@@ -38,7 +51,7 @@ module Mode
       def spawn!
         if command == 'restart'
           spawn_restart!
-        elsif ['stop', 'start'].include?(command)
+        elsif ['stop', 'status', 'start'].include?(command)
           spawn_command!(command)
         else
           raise "Unknown command #{command}"

data/lib/mode/connector/data_source.rb

@@ -65,7 +65,6 @@ module Mode
 
         if redshift?
           opts.merge!({
-            :sslmode => ssl_mode,
             :client_min_messages => '',
             :force_standard_strings => false
           })
@@ -78,10 +77,16 @@ module Mode
         opts
       end
 
+      def port_segment
+        port.nil? ? nil : ":#{port}"
+      end
+
+      def password_segment
+        password.nil? ? nil : ":#{password}"
+      end
+
       def connection_url
-        port_segment = port.nil? ? nil : ":#{port}"
-        password_segment = password.nil? ? nil : ":#{password}"
-        "#{adapter}://#{username}#{password_segment}@#{host}#{port_segment}/#{database}"
+        "#{adapter}://#{username}#{password_segment}@#{host}#{port_segment}/#{database}"        
       end
 
       def connection_dataset(query)

data/lib/mode/version.rb

@@ -1,3 +1,3 @@
 module Mode
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/spec/commands/connect_spec.rb

@@ -2,8 +2,19 @@ require 'spec_helper'
 
 describe Mode::Commands::Connect do
   let(:tmpdir) { Dir.mktmpdir }
-  let(:config) { Mode::Connector::Config.init(tmpdir) }
-  
+  let(:config) { Mode::Config.init(tmpdir) }
+  let(:connect_config) { Mode::Connector::Config.init(tmpdir) }
+
+  let(:data_source) {
+    Mode::Connector::DataSource.new('testdb', {
+      'adapter' => 'postgres',
+      'host' => 'localhost',
+      'username' => 'postgres',
+      'database' => 'warehouse',
+      'password' => nil
+    })
+  }
+
   before do
     initialize_logger
   end
@@ -13,12 +24,11 @@ describe Mode::Commands::Connect do
 
     connect.command.should == 'start'
     connect.concurrency.should == 4
-    connect.configuration.should_not == nil
   end
 
   it "registers connector" do
     connect = Mode::Commands::Connect.new('start')
-
+    
     registrar = double(:registrar, :perform! => true)
     Mode::Connector::Registrar.should_receive(:new).and_return(registrar)
 
@@ -43,6 +53,7 @@ describe Mode::Commands::Connect do
 
   it 'spawns with the start command' do
     connect = Mode::Commands::Connect.new('start')
+
     Mode::Connector::Daemon.should_receive(:spawn!).and_return(true)
 
     connect.send(:spawn!)
@@ -50,6 +61,7 @@ describe Mode::Commands::Connect do
 
   it 'spawns with the restart command' do
     connect = Mode::Commands::Connect.new('restart')
+
     Mode::Connector::Daemon.should_receive(:spawn!).twice.and_return(true)
 
     connect.send(:spawn!)
@@ -57,6 +69,7 @@ describe Mode::Commands::Connect do
 
   it 'spawns with the stop command' do
     connect = Mode::Commands::Connect.new('stop')
+
     Mode::Connector::Daemon.should_receive(:spawn!).and_return(true)
 
     connect.send(:spawn!)
@@ -64,6 +77,7 @@ describe Mode::Commands::Connect do
 
   it 'raises on spawn if the command is unrecognized' do
     connect = Mode::Commands::Connect.new('fake')
+
     Mode::Connector::Daemon.should_not_receive(:spawn!)
 
     expect { connect.send(:spawn!) }.to raise_error
@@ -77,4 +91,34 @@ describe Mode::Commands::Connect do
 
     connect.execute
   end
+
+  it 'verifies configuration and connectivity' do
+    connect = Mode::Commands::Connect.new('verify')
+
+    connect.stub(:config_dir).and_return(tmpdir)
+    connect.should_receive(:validate_config!).and_return(true)
+
+    conn    = double(:conn, :test_connection => true)
+    sources = double(:source, :connection => conn)
+    config  = double(:config, :data_sources => [sources])
+
+    connect.should_receive(:configuration).and_return(config)
+
+    connect.verify!
+  end
+
+  it 'should raise if a connection fails to connect' do
+    connect = Mode::Commands::Connect.new('verify')
+
+    connect.stub(:config_dir).and_return(tmpdir)
+    connect.should_receive(:validate_config!).and_return(true)
+
+    conn    = double(:conn, :test_connection => false)
+    sources = double(:source, :name => 'name', :connection => conn)
+    config  = double(:config, :data_sources => [sources])
+
+    connect.should_receive(:configuration).and_return(config)
+
+    expect { connect.verify! }.to raise_error
+  end
 end

data/spec/commands/login_spec.rb

@@ -168,6 +168,7 @@ describe Mode::Commands::Login do
     command = Mode::Commands::Login.new(:test => true)
     Mode::API::Request.should_receive(:get).with(:access_tokens).and_return(tokens_resource)
 
+    command.stub(:say)
     command.should_receive(:ask).and_return("2")
 
     chosen_token = command.send(:choose_access_token)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mode
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Mode Analytics
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-19 00:00:00.000000000 Z
+date: 2014-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor