mode 0.0.10 → 0.0.11

data/spec/config_spec.rb

@@ -26,6 +26,15 @@ describe Mode::Config do
     File.read(config.path).should == config.send(:to_yaml)
   end
 
+  it "should initialize with data sources" do
+    config = Mode::Config.init(tmpdir)
+    config.data_sources << Mode::Connector::DataSource.new('test', {})
+    config.save
+
+    config = Mode::Config.new(tmpdir)
+    config.data_sources.length.should == 1
+  end
+
   it "should have FILENAME" do
     Mode::Config::default_filename.should == 'config.yml'
   end

data/spec/connector/daemon_spec.rb

@@ -1,7 +1,10 @@
 require 'spec_helper'
 
 describe Mode::Connector::Daemon do
-  let(:working_dir) { Dir.mktmpdir }
+  let(:tmpdir) { Dir.mktmpdir }
+  let(:config) { Mode::Config.init(tmpdir) }
+
+  let(:daemon) { Mode::Connector::Daemon.new }
   let(:scheduler) { double(:scheduler, :start! => true, :stop! => true) }
 
   before do
@@ -9,22 +12,24 @@ describe Mode::Connector::Daemon do
   end
 
   it "starts a daemon" do
-    daemon = Mode::Connector::Daemon.new(:working_dir => working_dir)
+    daemon.stub(:config).and_return(config)
+
     Mode::Connector::Scheduler.should_receive(:new).and_return(scheduler)
 
     begin
-      daemon.start([5, []])
+      daemon.start
     ensure
       daemon.stop
     end
   end
 
   it "logs errors on failure" do
-    daemon = Mode::Connector::Daemon.new(:working_dir => working_dir)
-    Mode::Connector::Scheduler.should_receive(:new).and_raise(StandardError.new("BREAK"))
+    daemon.stub(:config).and_return(config)
+
+    daemon.should_receive(:scheduler).and_raise(StandardError.new("BREAK"))
 
     Mode::Logger.instance.should_receive(:error)
 
-    daemon.start([5, []])
+    daemon.start
   end
 end

data/spec/connector/daemonizer_spec.rb

@@ -0,0 +1,106 @@
+require 'spec_helper'
+
+describe Mode::Connector::Daemonizer do
+  let(:tmpdir) { Dir.mktmpdir }
+  let(:pid_file) { File.join(tmpdir, 'connect.pid') }
+  let(:executable) { File.join(tmpdir, 'executable') }
+
+  before do
+    STDERR.stub(:puts)
+    STDOUT.stub(:puts)
+
+    initialize_logger
+    FileUtils.touch(pid_file)
+    FileUtils.touch(executable)
+    File.chmod(0755, executable)
+  end
+
+  it "initializes" do
+    daemonizer = Mode::Connector::Daemonizer.new(
+      :pid_file => pid_file, :executable => executable)
+
+    daemonizer.args.should == []
+    daemonizer.timeout.should == 10
+    daemonizer.pid_file.should == pid_file
+    daemonizer.executable.should == executable
+  end
+
+  describe "#alive?" do
+    it 'returns true if process is alive' do
+      daemonizer = Mode::Connector::Daemonizer.new(
+        :pid_file => pid_file, :executable => executable)
+
+      Process.should_receive(:kill).and_return(true)
+
+      daemonizer.alive?.should == true
+    end
+
+    it 'returns false if the process is dead' do
+      daemonizer = Mode::Connector::Daemonizer.new(
+        :pid_file => pid_file, :executable => executable)
+
+      Process.should_receive(:kill).and_raise(Errno::ESRCH.new)
+
+      daemonizer.alive?.should == false
+    end
+
+    it 'returns false if the process cannot be queried' do
+      daemonizer = Mode::Connector::Daemonizer.new(
+        :pid_file => pid_file, :executable => executable)
+
+      Process.should_receive(:kill).and_raise(Errno::EPERM.new)
+
+      daemonizer.alive?.should == false
+    end
+  end
+
+  it 'starts the daemon' do
+    daemonizer = Mode::Connector::Daemonizer.new(
+      :pid_file => pid_file, :executable => executable)
+    daemonizer.should_receive(:alive?).and_return(false)
+
+    Spoon.should_receive(:spawnp).with(executable).and_return(:pid)
+
+    daemonizer.start
+  end
+
+  it 'stops the daemon' do
+    daemonizer = Mode::Connector::Daemonizer.new(
+      :pid_file => pid_file, :executable => executable)
+    daemonizer.should_receive(:alive?).and_return(true, false)
+
+    Process.should_receive(:kill).with("TERM", 0).and_return(true)
+
+    daemonizer.stop
+  end
+
+  it "forcefully stops the daemon after timeout" do
+    daemonizer = Mode::Connector::Daemonizer.new(
+      :pid_file => pid_file, :executable => executable)
+    
+    daemonizer.should_receive(:alive?).and_return(true, false)
+
+    Process.should_receive(:kill).with("KILL", 0).and_return(true)
+    Timeout.should_receive(:timeout).with(10).and_raise(Timeout::Error.new)
+
+    daemonizer.stop
+  end
+
+  it 'restarts the daemon' do
+    daemonizer = Mode::Connector::Daemonizer.new(
+      :pid_file => pid_file, :executable => executable)
+
+    daemonizer.should_receive(:stop)
+    daemonizer.should_receive(:start)
+
+    daemonizer.restart
+  end
+
+  it 'has default file paths' do
+    daemonizer = Mode::Connector::Daemonizer.new(
+      :pid_file => pid_file, :executable => executable)
+
+    daemonizer.send(:default_pid_file).should =~ /connect.pid/
+    daemonizer.send(:default_executable).should =~ /connect.rb/
+  end
+end

data/spec/connector/data_source_spec.rb

@@ -21,6 +21,8 @@ describe Mode::Connector::DataSource do
     }
   }
 
+  let(:conn) { double(:conn, :extension => true) }
+
   it "initializes with props" do
     source = Mode::Connector::DataSource.new('dev', props)
     source.adapter.should == 'postgres'
@@ -39,35 +41,31 @@ describe Mode::Connector::DataSource do
     source.send(:connection_url).should == "postgres://postgres@localhost/warehouse"
   end
 
+  it 'has a jdbc connection url' do
+    source = Mode::Connector::DataSource.new('dev', props.merge('adapter' => 'jdbc:redshift'))
+    source.send(:connection_url).should == "jdbc:postgresql://localhost/warehouse?user=postgres"
+  end
+
   it "has a connection" do
     source = Mode::Connector::DataSource.new('dev', props)
-    Sequel.should_receive(:connect).and_return(:connect)
-    source.connection.should == :connect
+    Sequel.should_receive(:connect).and_return(conn)
+    source.connection.should == conn
   end
 
   it 'has a connection for redshift' do
     source = Mode::Connector::DataSource.new('dev', redprops)
-    Sequel.should_receive(:connect).and_return(:connect)
-    source.connection.should == :connect
-  end
-
-  it 'has a connection dataset' do
-    source = Mode::Connector::DataSource.new('dev', props)
-
-    dataset = double(:dataset, :with_sql => :dataset)
-    connection = double(:connection, :dataset => dataset)
-    Sequel.should_receive(:connect).and_return(connection)
-    dataset = source.send(:connection_dataset, "SELECT * FROM fake")
-
-    dataset.should == :dataset
+    Sequel.should_receive(:connect).and_return(conn)
+    source.connection.should == conn
   end
 
   it "fetches results from dataset" do
     source = Mode::Connector::DataSource.new('dev', props)
 
     dataset = double(:dataset)
-    dataset.should_receive(:each).and_yield({'cnt' => 5})
-    source.should_receive(:connection_dataset).with("SELECT 1").and_return(dataset)
+    connection = double(:conn, :dataset => dataset)
+    dataset.should_receive(:fetch_rows).with("SELECT 1").and_yield({'cnt' => 5})
+
+    source.should_receive(:connection).and_return(connection)
 
     source.select("SELECT 1") do |row|
       row['cnt'].should == 5

data/spec/connector/registrar_spec.rb

@@ -4,8 +4,8 @@ describe Mode::Connector::Registrar do
   let(:tmpdir) { Dir.mktmpdir }
 
   let(:username) { 'besquared' }
-  let(:access_token) { 'access_token '}
-  let(:config) { Mode::Connector::Config.init(tmpdir) }
+  let(:password) { 'token_password '}
+  let(:config) { Mode::Config.init(tmpdir) }
   let(:path) { Mode::API::Request.data_source_connection_path }
 
   let(:props) {
@@ -22,10 +22,9 @@ describe Mode::Connector::Registrar do
     initialize_logger
 
     Mode::API::Request.configure('test', {
-      :port => 80,
-      :credentials => {
-        :username => username,
-        :access_token => access_token
+      'credentials' => {
+        'username' => username,
+        'password' => password
       }
     })
 

data/spec/connector/scheduler_spec.rb

@@ -21,11 +21,12 @@ describe Mode::Connector::Scheduler do
     rufus = double(:rufus)
     Rufus::Scheduler.should_receive(:new).and_return(rufus)
 
-    rufus.should_receive(:every).and_return(true)
+    rufus.should_receive(:interval).and_return(true)
     rufus.should_receive(:join).and_return(true)
     rufus.should_receive(:stop).and_return(true)
 
-    Sequel.should_receive(:connect).and_return(:connect)
+    conn = double(:conn, :extension => true)
+    Sequel.should_receive(:connect).and_return(conn)
 
     scheduler = Mode::Connector::Scheduler.new(data_sources)
 

data/spec/connector/uploader_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Mode::Connector::Uploader do
   let(:tmpdir) { Dir.mktmpdir }
   let(:outpath) { File.join(tmpdir, 'data.csv') }
-  let(:execution_path) { Mode::API::Request.data_source_connection_path }
+  let(:runs_path) { Mode::API::Request.data_source_connection_path }
 
   let(:dataset) {
     double(:dataset,
@@ -13,7 +13,7 @@ describe Mode::Connector::Uploader do
         'int' => :integer,
         'float' => :number
       }
-    )   
+    )
   }
 
   before do
@@ -22,15 +22,15 @@ describe Mode::Connector::Uploader do
   end
 
   it "initializes with a dataset" do
-    uploader = Mode::Connector::Uploader.new(execution_path, dataset)
+    uploader = Mode::Connector::Uploader.new(runs_path, dataset)
     uploader.dataset.should_not == nil
   end
 
   it "sends a dataset and columns" do
-    uploader = Mode::Connector::Uploader.new(execution_path, dataset)
+    uploader = Mode::Connector::Uploader.new(runs_path, dataset)
 
-    Mode::API::Request.should_receive(:put).with(execution_path,
-      :execution => {
+    Mode::API::Request.should_receive(:put).with(runs_path,
+      :report_run => {
         :dataset => {
           :count => 0,
           :columns => an_instance_of(String), 
@@ -43,8 +43,8 @@ describe Mode::Connector::Uploader do
   end
 
   it "sends error message and detail" do
-    Mode::API::Request.should_receive(:put).with(execution_path,
-      :execution => {
+    Mode::API::Request.should_receive(:put).with(runs_path,
+      :report_run => {
         :error => {
           :message => "message", 
           :detail => "detailed"
@@ -52,6 +52,6 @@ describe Mode::Connector::Uploader do
       }
     )
 
-    Mode::Connector::Uploader.send(:error!, execution_path, "message", "detailed")
+    Mode::Connector::Uploader.send(:error!, runs_path, "message", "detailed")
   end
 end

metadata

@@ -1,225 +1,225 @@
 --- !ruby/object:Gem::Specification
 name: mode
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Mode Analytics
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-01-20 00:00:00.000000000 Z
+date: 2014-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: terminal-table
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: terminal-table
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: data_kit
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: data_kit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: data_package
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: data_package
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: faraday
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: uri_template
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: uri_template
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: sequel
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: spoon
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: daemon-spawn
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: rufus-scheduler
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rufus-scheduler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: rake
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: profile
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: profile
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: rspec
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: simplecov
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: ruby-prof
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: warbler
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  type: :development
 description: CLI and Libraries for Mode Analytics
 email:
 - support@modeanalytics.com
@@ -236,6 +236,7 @@ files:
 - README.md
 - Rakefile
 - bin/mode
+- lib/connect.rb
 - lib/mode.rb
 - lib/mode/api/form.rb
 - lib/mode/api/link.rb
@@ -257,9 +258,9 @@ files:
 - lib/mode/commands/import.rb
 - lib/mode/commands/login.rb
 - lib/mode/config.rb
-- lib/mode/configurable.rb
-- lib/mode/connector/config.rb
+- lib/mode/connector/connect.rb
 - lib/mode/connector/daemon.rb
+- lib/mode/connector/daemonizer.rb
 - lib/mode/connector/data_source.rb
 - lib/mode/connector/dataset.rb
 - lib/mode/connector/message.rb
@@ -285,8 +286,8 @@ files:
 - spec/commands/import_spec.rb
 - spec/commands/login_spec.rb
 - spec/config_spec.rb
-- spec/connector/config_spec.rb
 - spec/connector/daemon_spec.rb
+- spec/connector/daemonizer_spec.rb
 - spec/connector/data_source_spec.rb
 - spec/connector/message_spec.rb
 - spec/connector/poller_spec.rb
@@ -311,7 +312,7 @@ homepage: http://www.modeanalytics.com/
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -326,12 +327,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.0.14
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.1.9
+signing_key:
 specification_version: 4
-summary: Provides a command line interface and ruby libraries to the Mode Analytics
-  Service
+summary: Provides a command line interface and ruby libraries to the Mode Analytics Service
 test_files:
 - spec/api/form_spec.rb
 - spec/api/link_spec.rb
@@ -345,8 +345,8 @@ test_files:
 - spec/commands/import_spec.rb
 - spec/commands/login_spec.rb
 - spec/config_spec.rb
-- spec/connector/config_spec.rb
 - spec/connector/daemon_spec.rb
+- spec/connector/daemonizer_spec.rb
 - spec/connector/data_source_spec.rb
 - spec/connector/message_spec.rb
 - spec/connector/poller_spec.rb