mode 0.0.18 → 0.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba4667740570363fcc09c91a5ab6306678f54731
-  data.tar.gz: 9d1e27811b305bd7f81da09fdb0794583852744e
+  metadata.gz: f79719aeee1b231678a845b20822da9d23adfa88
+  data.tar.gz: 923422856ba88ce2e6b4a0c0036848982f1615d5
 SHA512:
-  metadata.gz: 6a820c70b52f95e12f71c7a50a37975038986ebe83cdd7769c778f6ee6d60159187d6d42ad78005ef01f045133217203540e63f99edcb7e4fcc28c913b854f76
-  data.tar.gz: dfd181018bf5f35d3b5c5f1f41dc8713daa8b1291f4fcd75fc2609e41796b38fa4dfd2e8c208dbaea1c731e9430fa106595816e629a4116170058a0b9408ca14
+  metadata.gz: 4f26aa68bd1871d9d9483dd9a48cdd3cdc064f5cfa8e9bb8cd46c5d3eb63ac09fa5933f2bc3680c07fbd20b4817f3819ca10b771fe55d0aab7f74238f5ad3374
+  data.tar.gz: 8a2a26041037d95ba48d6ab6f9077d5960364f7f21aa7c2a6e6f7f57d03134f1bfe1f8f2ab5c94f7e72bbd7b954568f64d214f35e304e4bbd73aeffa9d763dbc

data/.gitignore

@@ -11,8 +11,6 @@ coverage
 lib/bundler/man
 pkg
 rdoc
-spec/reports
-test/tmp
-test/version_tmp
 tmp
-data_packages/*
+mode-ruby.jar
+media/*

data/bin/mode

@@ -5,4 +5,6 @@ require 'rubygems'
 require 'mode'
 require 'mode/cli'
 
+# Set the default task 
+
 Mode::CLI::Base.start(ARGV)

data/lib/connect.rb

@@ -21,4 +21,4 @@ trap("TERM") do
   daemon.stop
 end
 
-daemon.start
+daemon.start

data/lib/mode.rb

@@ -1,7 +1,5 @@
 require 'thor'
 require 'faraday'
-require 'data_kit'
-require 'data_package'
 
 require 'mode/version'
 
@@ -58,7 +56,4 @@ require 'mode/connector/daemonizer'
 require 'mode/commands/helpers'
 
 require 'mode/commands/login'
-require 'mode/commands/import'
 require 'mode/commands/connect'
-require 'mode/commands/analyze_field'
-require 'mode/commands/analyze_schema'

data/lib/mode/cli.rb

@@ -1,7 +1,3 @@
-require 'mode/cli/helpers'
-
 require 'mode/cli/base'
 require 'mode/cli/login'
-require 'mode/cli/analyze'
-require 'mode/cli/import'
-require 'mode/cli/connect'
+require 'mode/cli/connect'

data/lib/mode/cli/base.rb

@@ -1,3 +1,5 @@
+require 'sinatra/base'
+
 module Mode
   module CLI
     class Base < Thor
@@ -12,9 +14,10 @@ module Mode
         say "Mode CLI Version #{Mode::VERSION}"
       end
 
-      private
-      
-      include Mode::CLI::Helpers
+      desc "serve", "Daemonize admin server"
+      def serve
+        Mode::Connector::Daemon.new(:max_jobs => 4).start
+      end
     end
   end
-end
+end

data/lib/mode/cli/connect.rb

@@ -24,4 +24,6 @@ module Mode
       end
     end
   end
-end
+end
+
+# Swap all these out into their own commands start, stop, restart, etc.

data/lib/mode/commands/login.rb

@@ -46,7 +46,7 @@ module Mode
       def configure_credentials
         say "Enter your Mode credentials:"
         username = ask "Username:"
-        password = ask "Password:", :echo => false
+        password = ask "Password:"#, :echo => false
 
         # go ahead and configure API
         configure_api(username, password)
@@ -153,7 +153,7 @@ module Mode
         end
       end
 
-      def update_configuration(environment, username, access_token)        
+      def update_configuration(environment, username, access_token)
         config = find_or_create_config
 
         config.username     = username
@@ -179,4 +179,4 @@ module Mode
       end
     end
   end
-end
+end

data/lib/mode/connector/daemonizer.rb

@@ -37,9 +37,14 @@ module Mode
 
       def start
         abort "Mode connector already running" if alive?
-        abort "Insufficient permissions to start Mode connector" unless File.executable?(executable)
 
-        if pid = Spoon.spawnp(executable, *args.collect(&:to_s))
+        if RUBY_PLATFORM == 'java' && jar_file
+          pid = Spoon.spawnp("java", "-jar", jar_file, "serve")
+        else
+          pid = Spoon.spawnp(executable, *args.collect(&:to_s))
+        end
+
+        if pid
           create_pid(pid)
           STDOUT.puts "Mode connector running with pid #{pid}"
         else
@@ -91,6 +96,10 @@ module Mode
         exit!
       end
 
+      def jar_file
+        File.dirname(__FILE__).match(/\/([\w\d\-\.]+)!/).to_a.last
+      end
+
       def default_pid_file
         File.join(Mode::Config.default_dir, 'connect.pid')
       end
@@ -104,4 +113,4 @@ module Mode
       end
     end
   end
-end
+end

data/lib/mode/connector/scheduler.rb

@@ -25,14 +25,14 @@ module Mode
 
         scheduler.interval('15m') { register }
         scheduler.interval('5s')  { process_messages }
-        scheduler.join
+        scheduler.join # don't join if we're running from inside sinatra
       end
 
       def stop!
         stopper = Thread.new {
           scheduler.stop # Stop polling
         }
-        
+
         stopper.join # wait for jobs to finish
       end
 
@@ -73,4 +73,4 @@ module Mode
       end
     end
   end
-end
+end

data/lib/mode/version.rb

@@ -1,3 +1,3 @@
 module Mode
-  VERSION = "0.0.18"
+  VERSION = "0.0.19"
 end

data/mode.gemspec

@@ -22,14 +22,14 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "thor"
   spec.add_runtime_dependency "terminal-table"
 
-  # Data Packaging (In Development)
-  spec.add_runtime_dependency "data_kit"
-  spec.add_runtime_dependency "data_package"
+  # Web UI
+  spec.add_runtime_dependency "sinatra"
 
   # HTTP
-  spec.add_runtime_dependency "faraday"
-  spec.add_runtime_dependency "faraday_middleware"
   spec.add_runtime_dependency "uri_template"
+  spec.add_runtime_dependency "faraday", '~> 0.8.9'
+  spec.add_runtime_dependency "multipart-post", '~> 1.2.0'
+  spec.add_runtime_dependency "faraday_middleware", '~> 0.9.0'
 
   # Connectivity
   spec.add_runtime_dependency "sequel"
@@ -37,7 +37,7 @@ Gem::Specification.new do |spec|
   # Concurrency & Processes
   spec.add_runtime_dependency "spoon"
   spec.add_runtime_dependency "rufus-scheduler"
-    
+
   # Web Management
   # spec.add_runtime_dependency "launchy"
 
@@ -49,4 +49,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "warbler"
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mode
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.19
 platform: ruby
 authors:
 - Mode Analytics
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-03-24 00:00:00.000000000 Z
+date: 2014-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -39,7 +39,7 @@ dependencies:
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
-  name: data_kit
+  name: sinatra
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -53,7 +53,7 @@ dependencies:
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
-  name: data_package
+  name: uri_template
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -70,42 +70,42 @@ dependencies:
   name: faraday
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.9
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.9
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
-  name: faraday_middleware
+  name: multipart-post
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.0
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
-  name: uri_template
+  name: faraday_middleware
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.0
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -274,18 +274,11 @@ files:
 - lib/mode/api/resource.rb
 - lib/mode/auth/access_token.rb
 - lib/mode/cli.rb
-- lib/mode/cli/analyze.rb
 - lib/mode/cli/base.rb
 - lib/mode/cli/connect.rb
-- lib/mode/cli/helpers.rb
-- lib/mode/cli/import.rb
 - lib/mode/cli/login.rb
-- lib/mode/cli/package.rb
-- lib/mode/commands/analyze_field.rb
-- lib/mode/commands/analyze_schema.rb
 - lib/mode/commands/connect.rb
 - lib/mode/commands/helpers.rb
-- lib/mode/commands/import.rb
 - lib/mode/commands/login.rb
 - lib/mode/config.rb
 - lib/mode/connector/commands/select_report_run_dataset.rb
@@ -305,17 +298,15 @@ files:
 - lib/mode/logger.rb
 - lib/mode/version.rb
 - mode.gemspec
+- releases/mode-ruby-0.0.18.jar
 - script/console.rb
 - spec/api/form_spec.rb
 - spec/api/link_spec.rb
 - spec/api/request_spec.rb
 - spec/api/resource_spec.rb
 - spec/auth/access_token_spec.rb
-- spec/commands/analyze_field_spec.rb
-- spec/commands/analyze_schema_spec.rb
 - spec/commands/connect_spec.rb
 - spec/commands/helpers_spec.rb
-- spec/commands/import_spec.rb
 - spec/commands/login_spec.rb
 - spec/config_spec.rb
 - spec/connector/commands/select_report_run_dataset_spec.rb
@@ -372,11 +363,8 @@ test_files:
 - spec/api/request_spec.rb
 - spec/api/resource_spec.rb
 - spec/auth/access_token_spec.rb
-- spec/commands/analyze_field_spec.rb
-- spec/commands/analyze_schema_spec.rb
 - spec/commands/connect_spec.rb
 - spec/commands/helpers_spec.rb
-- spec/commands/import_spec.rb
 - spec/commands/login_spec.rb
 - spec/config_spec.rb
 - spec/connector/commands/select_report_run_dataset_spec.rb

data/lib/mode/cli/analyze.rb

@@ -1,20 +0,0 @@
-module Mode
-  module CLI
-    class Base < Thor
-      desc "analyze PATH [--field=POSITION] [--match-type=TYPE]", "Analyze a CSV file"
-      option :sample, :banner => 'RATE', :desc => "Proportion of rows to inspect. Example: 0.5"
-      option :field, :banner => 'POSITION', :desc => "Field positions begin at 0. Example: 10"
-      option :match_type, :banner => 'TYPE', :desc => "One of the following: string, number, integer, datetime, boolean"
-      # option :keys, :banner => 'POSITIONS (ex: 0,2)', :default => String.new
-      def analyze(path = nil)
-        #keys = options[:keys].split(',').collect(&:strip).collect(&:to_i)
-
-        if field_pos = options[:field]
-          Mode::Commands::AnalyzeField.new(path, field_pos, options).execute
-        else
-          Mode::Commands::AnalyzeSchema.new(path, options).execute
-        end
-      end
-    end
-  end
-end

data/lib/mode/cli/helpers.rb

@@ -1,13 +0,0 @@
-module Mode
-  module CLI
-    module Helpers
-      def valid_file?(file)
-        !file.nil? && File.exist?(file)
-      end
-
-      def valid_table?(table)
-        table =~ /[\w\d\_\-]+\/[\w\d\_\-]+/
-      end
-    end
-  end
-end

data/lib/mode/cli/import.rb

@@ -1,33 +0,0 @@
-module Mode
-  module CLI
-    class Base < Thor
-      desc "import SOURCE ACCOUNT/TABLENAME [--replace]", "Import a flat file into the Mode data warehouse", :hide => true
-      long_desc <<-LONGDESC
-        The import commands allows you to create or replace tables 
-        in the Mode data warehouse with data from flat files and
-        data packages. The default action is create with an optional
-        flag to replace the table.
-
-        Data can be imported from CSV files or data packages with the following command
-
-        1. CSV File
-        \x5> $ mode import gdp_quarterly.csv besquared/gdp_quarterly
-
-        2. Data Package File
-        \x5> $ mode import gdp/data/quarterly.json besqaured/quarterly_gdp
-
-      LONGDESC
-      option :replace, :type => :boolean
-      option :primary_key, :banner => 'pos1[,pos2,...] (ex: 0,2)'
-      def import(source, table)
-        unless valid_table?(table)
-          error "Error: Invalid account or table name given"
-          return
-        end
-
-        account, table_name = *table.split('/')
-        Mode::Commands::Import.new(source, account, table_name).execute
-      end
-    end
-  end
-end

data/lib/mode/cli/package.rb

@@ -1,13 +0,0 @@
-module Mode
-  module CLI
-    class Base < Thor
-      desc "package SOURCE PACKAGEPATH [--name=NAME] [--resource-name=NAME]", "Creates a new data package from a csv file"
-      option :name, :desc => 'The name of the package'
-      option :resource_name, :default => 'data', :desc => 'The name of the resource in package'
-      def package(source, package_path)
-        name = options[:name] || package_path.split(File::Separator).last
-        Mode::Commands::Package.new(source, package_path, name, options[:resource_name]).execute
-      end
-    end
-  end
-end

data/lib/mode/commands/analyze_field.rb

@@ -1,60 +0,0 @@
-require 'terminal-table'
-
-module Mode
-  module Commands
-    class AnalyzeField
-      include Mode::Commands::Helpers
-
-      attr_accessor :path
-      attr_accessor :field_pos
-      attr_accessor :options
-
-      def initialize(path, field_pos, options = {})
-        @path = path
-        @field_pos = field_pos.to_i
-        @options = options
-      end
-
-      def execute
-        if path.nil? || !File.exist?(path)
-          puts "Error: Couldn't find file at #{path}"
-          return
-        end
-
-        csv = DataKit::CSV::Parser.new(path)
-
-        puts "Analyzing field #{field_pos} at #{path || 'input'}"
-
-        analysis, total_time = timer_block do
-          DataKit::CSV::FieldAnalyzer.analyze(csv, field_pos, {
-            :match_type => match_type, :sampling_rate => 1
-          })
-        end
-
-        puts "Analyzed #{analysis.row_count} rows in #{'%.2f' % total_time} seconds\n"
-
-        display(analysis)
-      end
-
-      private
-
-      def display(analysis)
-        table = Terminal::Table.new(:headings => [
-          'Row No.', 'Type', 'Value'
-        ])
-
-        analysis.types.each do |type, rows|
-          rows.each do |row_num|
-            table.add_row [row_num, type, analysis.value_at(row_num)]
-          end
-        end
-
-        puts table
-      end
-
-      def match_type
-        options[:match_type] ? options[:match_type].to_sym : :any
-      end
-    end
-  end
-end

data/lib/mode/commands/analyze_schema.rb

@@ -1,111 +0,0 @@
-require 'terminal-table'
-
-module Mode
-  module Commands
-    class AnalyzeSchema
-      include Mode::Commands::Helpers
-
-      attr_accessor :path
-      attr_accessor :options
-
-      def initialize(path, options = {})
-        @path = path
-        @options = options
-      end
-
-      def execute
-        if path.nil? || !File.exist?(path)
-          puts "Error: Couldn't find file at #{path}"
-          return
-        end
-
-        csv = build_csv
-        analysis = build_analysis(csv)
-        display_analysis(analysis)
-      end
-
-      private
-
-      def build_csv
-        DataKit::CSV::Parser.new(path)
-      end
-
-      def build_analysis(csv)
-        puts "Analyzing #{path || 'input'} (Sampling #{'%.2f' % (100 * sampling_rate)}%)..."
-
-        analysis, total_time = timer_block do
-          DataKit::CSV::SchemaAnalyzer.analyze(csv, :sampling_rate => sampling_rate)
-        end
-
-        puts "Analyzed #{analysis.sample_count} of #{analysis.row_count} rows in #{'%.2f' % total_time} seconds\n"
-
-        analysis
-      end
-
-      def sampling_rate
-        file_size = File.size(path)
-        (options[:sample] || DataKit::CSV::SchemaAnalyzer.sampling_rate(file_size)).to_f
-      end
-
-      def display_analysis(analysis)
-        table = build_table
-        populate_table(analysis, table)
-        puts table
-      end
-
-      def build_table
-        Terminal::Table.new(:headings => [
-          'Field No.', 'Field', 'Type', 
-          'String (%)', 'Integer (%)', 'Number (%)',
-          'Date/Time (%)', 'Boolean (%)', 'Empty (%)'
-        ])
-      end
-
-      def populate_table(analysis, table)
-        analysis.fields.each_with_index do |field_name, index|
-          build_table_row(analysis, table, field_name, index)
-        end
-      end
-
-      def build_table_row(analysis, table, field_name, index)
-        row = [index, field_name]
-
-        append_row_type(analysis, field_name, row)
-        append_row_type_counts(analysis, field_name, row)
-
-        table.add_row(row)
-      end
-
-      def append_row_type(analysis, field_name, row)
-        field_type = analysis.type?(field_name)
-
-        if analysis.has_single_type?(field_name)
-          row << field_type
-        elsif analysis.has_only_numeric_types?(field_name)
-          row << field_type
-        else
-          row << '** ' + field_type.to_s
-        end
-      end
-
-      def append_row_type_counts(analysis, field_name, row)
-        DataKit::Dataset::Field::Types.each do |type|
-          type_count = analysis.type_count(field_name, type)
-          row << format_percentage_cell(type_count, analysis.sample_count)
-        end
-      end
-
-      def format_percentage_cell(numerator, denominator)
-        cell = { :alignment => :right }
-
-        if numerator == 0
-          cell[:value] = nil
-        else
-          cell[:value] = '%.2f' % (100 * (numerator / denominator.to_f)) + '%'
-        end
-
-        cell
-      end
-    end
-  end
-end

data/lib/mode/commands/import.rb

@@ -1,224 +0,0 @@
-module Mode
-  module Commands
-    class Import
-      include Mode::Commands::Helpers
-      
-      attr_reader :source
-      attr_reader :account
-      attr_reader :table_name
-
-      def initialize(source, account, table_name)
-        @source = source
-        @account = account
-        @table_name = table_name
-      end
-
-      def execute
-        validate_config!
-        
-        package = make_package
-        uploaded = upload_package(package)
-        imported = import_package(uploaded)
-      end
-
-      def make_package
-        find_or_build_package(source, :name => table_name)
-      end
-
-      def upload_package(package)
-        resource = package.resources.first
-        file_path = File.join(resource.base_path, resource.path)
-
-        replace_resource_path!(resource)
-
-        Mode::API::Request.post(upload_path, :package => {
-          :contents => {
-            'datapackage.json' => package.to_json,
-            resource.path => Faraday::UploadIO.new(file_path, 'application/octet-stream')
-          }, :name => table_name
-        })
-      end
-
-      def import_package(uploaded)
-        resource = parse_uploaded_response(uploaded)
-        submit_import_form(resource, { 'table_name' => table_name })
-      end
-
-      def target_resource_path(path)
-        self.class.target_resource_path(path)
-      end
-
-      private
-
-      def upload_path
-        Mode::API::Request.packages_path
-      end
-
-      def find_or_build_package(source, options = {})
-        self.class.find_or_build_package(source, options)
-      end
-
-      # We replace the resource path with the desired path on the remote end
-      def replace_resource_path!(resource)
-        resource.path = target_resource_path(resource.path)
-      end
-
-      def submit_import_form(resource, params)
-        resource.forms('import').submit!(:import => params)
-      end
-
-      def parse_uploaded_response(content)
-        resource = Mode::API::Resource.new(content)
-      end
-
-      class << self
-        #
-        # Utilities that can be useful elsewhere
-        #
-
-        def find_package(source, path = nil)
-          path = path || search_path(source)
-
-          if path =~ /\/data$/
-            parent = parent_path(path)
-            find_package(source, parent)
-          elsif package_exists?(path)
-            DataPackage::Package.open(path)
-          else
-            nil
-          end
-        end
-
-        def build_package(source, options = {})
-          name = options[:name] || 'data'
-          dest = options[:dest] || tmpdir
-
-          if File.exist?(source)
-            converter = convert(source)
-            DataPackage::Package.new(dest).tap do |package|
-              package.name = name
-              package.version = '0.0.1'
-              package.resources << build_resource(converter)
-            end
-          else
-            nil
-          end
-        end
-
-        def find_or_build_package(source, options = {})
-          package = find_package(source)
-
-          if package.nil?
-            build_opts = {
-              :name => options[:name],
-              :dest => options[:dest]
-            }
-            package = build_package(source, build_opts)
-          else
-            package = prune_package(source, package)
-          end
-
-          package
-        end
-
-        def target_resource_path(path = nil)
-          "data/index#{path.nil? ? '.csv' : File.extname(path)}"
-        end
-
-        private
-
-        #
-        # Package Building
-        #
-
-        def build_resource(converter)
-          DataPackage::Resource.new(tmpdir, {
-            'name' => 'index.csv',
-            'path' => target_resource_path,
-            'size' => File.size?(target),
-            'schema' => build_schema(converter)
-          })
-        end
-
-        def build_schema(converter)
-          {
-            'fields' => build_fields(converter),
-            'dialect' => DataPackage::Dialect.new
-          }
-        end
-
-        def build_fields(converter)
-          converter.field_types.inject([]) do |fields, (field_name, field_type)|
-            fields << {'name' => field_name, 'type' => field_type.to_s}
-          end
-        end
-
-        #
-        # Data Conversion
-        #
-
-        def convert(source)
-          csv = DataKit::CSV::Parser.new(source)
-          analysis = DataKit::CSV::SchemaAnalyzer.analyze(csv, :sampling_rate => 1.0)
-          DataKit::CSV::Converter.convert(csv, analysis, target)
-        end
-
-        def tmpdir
-          @tmpdir ||= Dir.mktmpdir
-        end
-
-        def tmppath(path)
-          File.join(tmpdir, path)
-        end
-
-        def target(path = 'data', name = 'index.csv')
-          full_path = tmppath(path)
-          FileUtils.mkdir_p(full_path)
-          @target ||= File.join(full_path, name)
-        end
-
-        #
-        # Checks and Validations
-        #
-
-        def search_path(source)
-          File.file?(source) ? File.dirname(source) : source
-        end
-
-        def package_exists?(path)
-          DataPackage::Package.exist?(path)
-        end
-
-        def parent_path(path)
-          File.expand_path(File.join(path, '..'))
-        end
-
-        def resource_path(path)
-          matched = path.match(/((data\/)?[^\/]+)$/)
-          matched.nil? ? matched : matched.to_a.first
-        end
-
-        def first_resource(package)
-          package.resources.find{ |r| not r.path.nil? }
-        end
-
-        def find_resource(package, path)
-          package.resources.find{ |r| r.path == path }
-        end
-
-        def prune_package(source, package)
-          if File.directory?(source)
-            resource = first_resource(package)
-          elsif File.file?(source)
-            resource_path = resource_path(source)
-            resource = find_resource(package, resource_path)
-          end
-
-          package.resources = []
-          package.resources << resource
-          package
-        end
-      end
-    end
-  end
-end

data/spec/commands/analyze_field_spec.rb

@@ -1,26 +0,0 @@
-require 'spec_helper'
-
-describe Mode::Commands::AnalyzeField do
-  let(:tmpdir) { Dir.mktmpdir }
-
-  before do
-    initialize_logger
-  end
-
-  it "should analyze a csv" do
-    path = fixture_path('espn_draft.csv')
-    command = Mode::Commands::AnalyzeField.new(path, 1)
-
-    command.stub(:puts).and_return(true)
-
-    command.execute
-  end
-
-  it "should error out if the csv file doesn't exist" do
-    command = Mode::Commands::AnalyzeField.new("fake.yml", 1)
-
-    command.should_receive(:puts)
-
-    command.execute
-  end
-end

data/spec/commands/analyze_schema_spec.rb

@@ -1,26 +0,0 @@
-require 'spec_helper'
-
-describe Mode::Commands::AnalyzeSchema do
-  let(:tmpdir) { Dir.mktmpdir }
-
-  before do
-    initialize_logger
-  end
-
-  it "should analyze a csv" do
-    path = fixture_path('espn_draft.csv')
-    command = Mode::Commands::AnalyzeSchema.new(path)
-
-    command.stub(:puts).and_return(true)
-
-    command.execute
-  end
-
-  it "should error out if the csv file doesn't exist" do
-    command = Mode::Commands::AnalyzeSchema.new("fake.yml", keys: [0,1])
-
-    command.should_receive(:puts)
-
-    command.execute
-  end
-end

data/spec/commands/import_spec.rb

@@ -1,160 +0,0 @@
-require 'spec_helper'
-
-describe Mode::Commands::Import do
-  let(:tmpdir) { Dir.mktmpdir }
-  let(:config) { Mode::Config.init(tmpdir) }
-  let(:packages_path) { Mode::API::Request.packages_path }
-  
-  before do
-    initialize_logger
-  end
-
-  it "generates target resource path with a csv extension" do
-    source = fixture_path("espn_draft/data.csv")
-    path = Mode::Commands::Import.send(:target_resource_path, source)
-
-    path.should == "data/index.csv"
-  end
-
-  it "generates target resource path with a non-csv extension" do
-    source = fixture_path("espn_draft.json")
-    path = Mode::Commands::Import.send(:target_resource_path, source)
-
-    path.should == "data/index.json"
-  end
-
-  describe 'finding a package from a source file' do
-    it 'returns the package if the file is adjacent to datapackage.json' do
-      source = fixture_path("espn_draft/data.csv")
-      package = Mode::Commands::Import.find_package(source)
-
-      package.base_path.should == fixture_path("espn_draft")
-    end
-
-    it 'returns the package if the file is inside of the data subdirectory' do
-      source = fixture_path("country-codes/data/country-codes.csv")
-      package = Mode::Commands::Import.find_package(source)
-
-      package.base_path.should == fixture_path("country-codes")
-    end
-
-    it 'returns nil if a package is not found' do
-      source = fixture_path("espn_draft.csv")
-      Mode::Commands::Import.find_package(source).should == nil
-    end
-  end
-
-  describe 'finding a package from a source directory' do
-    it 'returns the package if it exists in the directory' do
-      source = fixture_path("espn_draft")
-      package = Mode::Commands::Import.find_package(source)
-
-      package.base_path.should == fixture_path("espn_draft")
-    end
-
-    it 'returns nil if the package is not found in the directory' do
-      source = fixture_path
-
-      Mode::Commands::Import.find_package(source).should == nil
-    end
-  end
-
-  describe 'building a package from a source file' do
-    it 'build the package' do
-      source = fixture_path("espn_draft.csv")
-      package = Mode::Commands::Import.build_package(source, :dest => tmpdir)
-
-      package.base_path.should == tmpdir
-    end
-
-    it 'returns nil if the file does not exist' do
-      source = fixture_path('nope')
-      Mode::Commands::Import.build_package(source).should == nil
-    end
-  end
-
-  describe 'finding or building a package from a source file' do
-    it 'returns the package and resource name for a file in a datapackage' do
-      source = fixture_path("espn_draft/data.csv")
-      package = Mode::Commands::Import.find_or_build_package(source)
-
-      package.resources.first.path.should == 'data.csv'
-      package.base_path.should == fixture_path("espn_draft")
-    end
-
-    it 'returns the package and resource name for a file outisde a datapackage' do
-      source = fixture_path("espn_draft.csv")
-      package = Mode::Commands::Import.find_or_build_package(source, :dest => tmpdir)
-
-      package.base_path.should == tmpdir
-      package.resources.first.path.should == 'data/index.csv'
-    end
-  end
-
-  describe 'finding or building a package from a source directory' do
-    it 'returns the package and resource name' do
-      source = fixture_path("espn_draft")
-      package = Mode::Commands::Import.find_or_build_package(source, :dest => tmpdir)
-
-      package.resources.first.path.should == 'data.csv'
-      package.base_path.should == fixture_path("espn_draft")
-    end
-  end
-
-  describe 'uploading a package' do
-    it 'uploads a package' do
-      Mode::API::Request.should_receive(:post).and_return(true)
-
-      source = fixture_path("espn_draft.csv")
-      package = Mode::Commands::Import.find_or_build_package(source, :dest => tmpdir)
-
-      import = Mode::Commands::Import.new(source, 'besquared', 'espn_draft')
-
-      import.upload_package(package).should == true
-    end
-  end
-
-  describe 'executing an import' do
-    it 'finds and upload a package' do
-      Mode::API::Request.should_receive(:post).with(packages_path, :package => {
-        :contents => {
-          'datapackage.json' => an_instance_of(String),
-          'data/index.csv' => an_instance_of(Faraday::UploadIO)
-        }, :name => 'espn_draft'
-      }).and_return(:package)
-
-      source = fixture_path("espn_draft/data.csv")
-      import = Mode::Commands::Import.new(source, 'besquared', 'espn_draft')
-
-      resource = double(:resource)
-      import_params = { 'table_name' => 'espn_draft' }
-      import.should_receive(:parse_uploaded_response).with(:package).and_return(resource)
-      import.should_receive(:submit_import_form).with(resource, import_params).and_return(true)
-      
-      import.should_receive(:validate_config!).and_return(true)
-
-      import.execute
-    end
-
-    it 'finds and uploads country codes package' do
-      Mode::API::Request.should_receive(:post).with(packages_path, :package => {
-        :contents => {
-          'datapackage.json' => an_instance_of(String),
-          'data/index.csv' => an_instance_of(Faraday::UploadIO)
-        }, :name => 'country_codes'
-      }).and_return(:package)
-
-      source = fixture_path("country-codes/data/country-codes.csv")
-      import = Mode::Commands::Import.new(source, 'besquared', 'country_codes')
-
-      resource = double(:resource)
-      import_params = { 'table_name' => 'country_codes' }
-      import.should_receive(:parse_uploaded_response).with(:package).and_return(resource)
-      import.should_receive(:submit_import_form).with(resource, import_params).and_return(true)
-
-      import.should_receive(:validate_config!).and_return(true)
-
-      import.execute
-    end
-  end
-end