mode 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bafc28cae256c4ce4821bb00753799dadb4c468c
-  data.tar.gz: 7360d725309e1253b0cff15f9974942405fbd370
+  metadata.gz: b2c6df3ccb06a07283edcf39c63589afb87703dd
+  data.tar.gz: 344a3c504ecd0a4a00a5b7657baf993c4686a1a1
 SHA512:
-  metadata.gz: 1e6ffd7b71345345d3e8399c74a7b6b358353ae632839ac60f46085cb0cbfaed4c09f4e2a748429ece0df50ed802095977adf605b92812e462544b2a864c4e56
-  data.tar.gz: 9bd2f1c0f0f3fe7f788a83785d7d1b591d6e355231ea3507dcf70db113e44d1ffc5c44b08cda7a0d65bd3a469ffd481ae8b9f8e781f1536d06f748752ca0a4bd
+  metadata.gz: 8b98ace299b5475dcf6a9eca4dc069cc0dea59c85ef800439f0141c4fb484bcb2a7111903ed20d9e710ebf4063db01db4e2751fa3332ec08128bc942b083f19b
+  data.tar.gz: c9a02420d3efc6597e12ea1245f6048ae38797531bcdf6a1d74f61f9c67a346a0b9d262020af2ba16ef9f38b40af87910d0886a3cd498b3e4437518e0c7de16b

data/.rspec

@@ -1,2 +1,3 @@
+--tty
 --color
 --format documentation

data/.travis.yml

@@ -2,6 +2,7 @@ language: ruby
 
 rvm:
   - 2.0.0
+  - jruby-19mode
 
 script:
   - CODECLIMATE_REPO_TOKEN=2c6f0a277b4e6919f0fd5e5fdef7bf7adcb4e7a7da23d71a3ac4b07093446e4d bundle exec rake

data/bin/mode

@@ -1,13 +1,8 @@
 #!/usr/bin/env ruby
 
-begin
-  require 'mode'
-  require 'mode/cli'
-rescue LoadError
-  require 'rubygems'
+require 'rubygems'
 
-  require 'mode'
-  require 'mode/cli'
-end
+require 'mode'
+require 'mode/cli'
 
 Mode::CLI::Base.start(ARGV)

data/lib/connect.rb

@@ -0,0 +1,13 @@
+#!/usr/bin/env ruby
+
+$LOAD_PATH.unshift File.dirname(__FILE__)
+
+require 'mode'
+
+runner = Mode::Connector::Daemon.new(:max_jobs => ARGV[0] || 4)
+
+trap("INT")  { runner.stop }
+trap("HUP")  { runner.stop }
+trap("TERM") { runner.stop }
+
+runner.start

data/lib/mode.rb

@@ -5,27 +5,34 @@ require 'data_package'
 
 require 'mode/version'
 
+#
 # Config & Logging
-require 'mode/configurable'
+#
 require 'mode/config'
 require 'mode/logger'
 
+#
 # Auth
+#
 require 'mode/auth/access_token'
 
-
+#
 # API
+#
 require 'mode/api/link'
 require 'mode/api/form'
 require 'mode/api/resource'
 require 'mode/api/request'
 
+#
 # Connector
-require 'mode/connector/config'
+#
+
+# Core
 require 'mode/connector/type_map'
 require 'mode/connector/data_source'
-require 'mode/connector/dataset'
 
+# Operations
 require 'mode/connector/registrar'
 require 'mode/connector/scheduler'
 require 'mode/connector/poller'
@@ -33,11 +40,17 @@ require 'mode/connector/processor'
 require 'mode/connector/selector'
 require 'mode/connector/uploader'
 
-require 'mode/connector/daemon'
+# Models
+require 'mode/connector/dataset'
 require 'mode/connector/message'
 
+# Daemon
+require 'mode/connector/daemon'
+require 'mode/connector/daemonizer'
 
+#
 # Commands
+#
 require 'mode/commands/helpers'
 
 require 'mode/commands/login'

data/lib/mode/api/link.rb

@@ -21,6 +21,10 @@ module Mode
         template.expand(params)
       end
 
+      def follow(params = {})
+        Mode::API::Request.get(expand(params))
+      end
+
       private
 
       def template

data/lib/mode/api/request.rb

@@ -48,8 +48,10 @@ module Mode
       end
 
       def log_response(level, response)
+        response_lines = response.body.split("\n")
+
         Mode::Logger.instance.send(level,
-          "API::Request", "#{response.status}", ["#{method.upcase} #{path}"])
+          "API::Request", "#{response.status}", ["#{method.upcase} #{path}", *response_lines])
       end
 
       class << self
@@ -59,6 +61,7 @@ module Mode
 
         attr_reader :environment
         attr_reader :credentials
+        attr_reader :access_token
 
         def valid?
           !environment.nil?
@@ -72,17 +75,23 @@ module Mode
 
         def username
           validate!
-          @credentials[:username]
+          @credentials['username']
+        end
+
+        def password
+          validate!
+          @credentials['password']
         end
 
         def access_token
           validate!
-          @credentials[:access_token]
+          @access_token
         end
 
         def configure(environment, options = {})
           @environment = environment
-          @credentials = options[:credentials]
+          @credentials = options['credentials']
+          @access_token = options['access_token']
         end
 
         #
@@ -121,20 +130,21 @@ module Mode
           "/api/#{username}"
         end
 
-        def access_tokens_path
-          "#{base_path}/access_tokens"
-        end
-
         def packages_path
           "#{base_path}/packages"
         end
 
+        def access_tokens_path
+          "#{base_path}/access_tokens"
+        end
+
         def data_source_connections_path
           "#{base_path}/data_source_connections"
         end
 
         def data_source_connection_path
-          [data_source_connections_path, access_token].join('/').strip
+          token = access_token && access_token['token']
+          [data_source_connections_path, token].join('/').strip
         end
 
         def data_source_connection_messages_path
@@ -149,7 +159,7 @@ module Mode
             builder.request  :multipart # adds small overhead to each request 
             builder.request  :url_encoded
             builder.adapter  Faraday.default_adapter
-            builder.basic_auth(username, access_token)
+            builder.basic_auth(username, password)
           end
         end
 

data/lib/mode/auth/access_token.rb

@@ -15,9 +15,25 @@ module Mode
         resource.token
       end
 
+      def password
+        resource.password
+      rescue
+        nil
+      end
+
       def account_name
         resource.account_name
       end
+
+      def verify(password)
+        verified = resource.links('verify').follow(:password => password)
+
+        if verified.is_a?(Mode::API::Resource)
+          Mode::Auth::AccessToken.new(verified)
+        else
+          nil
+        end
+      end
     end
   end
 end

data/lib/mode/cli/connect.rb

@@ -20,7 +20,7 @@ module Mode
           say "Error: valid commands for connect are start, stop and restart"
         end
       rescue => err
-        say "Error: #{err.message}"
+        say "Error: #{err.message} #{err.backtrace}"
       end
     end
   end

data/lib/mode/commands/analyze_field.rb

@@ -23,9 +23,7 @@ module Mode
 
         csv = DataKit::CSV::Parser.new(path)
 
-        field_name = csv.headers[field_pos]
-
-        puts "Analyzing #{field_name} at #{path || 'input'}"
+        puts "Analyzing field #{field_pos} at #{path || 'input'}"
 
         analysis, total_time = timer_block do
           DataKit::CSV::FieldAnalyzer.analyze(csv, field_pos, {

data/lib/mode/commands/connect.rb

@@ -12,79 +12,54 @@ module Mode
         @concurrency = options[:concurrency] || 4
       end
 
-      def execute
+      def execute(options = {})
         validate_config!
-        register! if ['start', 'restart'].include?(command)
-        spawn!
+
+        register! 
+        run_command!
       end
 
       def verify!
+        load_drivers!
         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
+          verify_data_source!(data_source)
         end
       end
 
       private
 
-      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!
+        if ['start', 'restart'].include?(command)
+          Mode::Connector::Registrar.new(configuration).perform!
+        end
       end
 
-      def spawn!
-        if command == 'restart'
-          spawn_restart!
-        elsif ['stop', 'status', 'start'].include?(command)
-          spawn_command!(command)
+      def run_command!
+        if command == 'status'
+          daemon.alive?
+        elsif ['stop', 'start', 'restart'].include?(command)
+          daemon.send(command)
         else
           raise "Unknown command #{command}"
         end
       end
 
-      def spawn_restart!
-        begin
-          spawn_command!('stop')
-        ensure
-          spawn_command!('start')
+      def verify_data_source!(data_source)
+        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
 
-      def spawn_command!(command)
-        Mode::Connector::Daemon.spawn!(spawn_opts, spawn_args(command))
-      end
-
-      def spawn_opts
-        {
-          :sync_log => true,
-          :working_dir => working_dir,
-          :log_file => File.join(working_dir, 'connect.log'),
-          :pid_file => File.join(working_dir, 'connect.pid')
-        }
-      end
-
-      def spawn_args(command)
-        [command, concurrency, configuration.data_sources]
+      def configuration
+        @configuration ||= Mode::Config.new(config_dir)
       end
 
-      def working_dir
-        @working_dir ||= File.expand_path('~/.mode')
+      def daemon        
+        @daemon ||= Mode::Connector::Daemonizer.new(:args => [concurrency])
       end
     end
   end

data/lib/mode/commands/helpers.rb

@@ -10,16 +10,16 @@ module Mode
         Mode::Config.default_dir
       end
 
-      def config_path
-        Mode::Config.full_path(config_dir)
+      def drivers_dir
+        File.join(config_dir, 'drivers')
       end
 
       def config_exists?
         Mode::Config.exists?(config_dir)
       end
 
-      def connect_config_exists?
-        Mode::Connector::Config.exists?(config_dir)
+      def config
+        @config ||= Mode::Config.new(config_dir)
       end
 
       def require_config!
@@ -28,17 +28,10 @@ module Mode
         end
       end
 
-      def require_connect_config!
-        unless connect_config_exists?
-          raise "No connect configuration file found."
-        end
-      end
-
       def require_credentials!
         message = "Couldn't find Mode login credentials. Please use `mode login` before continuing."
 
         if config_exists?
-          config = Mode::Config.new(config_dir)
           unless config.username && config.access_token
             raise message
           end
@@ -47,15 +40,27 @@ module Mode
         end
       end
 
-      def configure_api_requests!
-        config = Mode::Config.new(config_dir)
+      def validate_config!
+        require_config!
+        require_credentials!
+        configure_api_requests!
+      end
 
+      def load_drivers!
+        if RUBY_PLATFORM == 'java'
+          Dir[File.join(drivers_dir, '*.jar')].each do |driver|
+            load driver
+          end
+        end
+      end
+
+      def configure_api_requests!
         Mode::API::Request.configure(
-          config.environment, {            
-            :credentials => {
-              :username => config.username,
-              :access_token => config.access_token
-            }
+          config.environment, {
+            'credentials' => {
+              'username' => config.username,
+              'password' => config.access_token_password
+            }, 'access_token' => config.access_token
           }
         )
       end

data/lib/mode/commands/import.rb

@@ -11,13 +11,11 @@ module Mode
         @source = source
         @account = account
         @table_name = table_name
-
-        require_config!
-        require_credentials!
-        configure_api_requests!
       end
 
       def execute
+        validate_config!
+        
         package = make_package
         uploaded = upload_package(package)
         imported = import_package(uploaded)