quandl 0.2.27 → 0.3.0

data/spec/lib/quandl/command/superset_spec.rb

@@ -0,0 +1,28 @@
+# encoding: utf-8
+require 'spec_helper'
+require 'open3'
+require 'quandl/client'
+require 'quandl/format'
+
+describe "./bin/quandl superset" do
+
+  let(:command){ self.class.superclass.description }
+  subject{ quandl("superset #{command}") }
+  
+  context "new" do
+    its(:stdout){ should match Quandl::Client::Superset.example.to_qdf }
+  end
+  
+  context "upload spec/fixtures/superset.qdf" do
+    its(:stdout){ should match /Created|OK/ }
+  end
+  
+  context "download SUPERSET_EXAMPLE" do
+    its(:stdout){ should match /SUPERSET_EXAMPLE/ }
+  end
+  
+  context "delete SUPERSET_EXAMPLE" do
+    its(:stdout){ should match /OK/ }
+  end
+  
+end

data/spec/lib/quandl/command/upload_spec.rb

@@ -1,39 +1,86 @@
 # encoding: utf-8
 require 'spec_helper'
 
-describe Quandl::Command::Tasks::Upload do
+describe "./bin/quandl upload" do
   
-  it "should upload spec/fixtures/data/datasets.qdf" do
-    Quandl::Logger.should_receive(:info).with(/OK|Created/).exactly(4).times
-    Quandl::Command::Tasks::Upload.call( 'spec/fixtures/data/datasets.qdf' )
+  let(:prefix){ "upload" }
+  let(:command){ self.class.superclass.description }
+  subject{ quandl( [prefix, command].flatten.join(" ") ) }
+  
+  context data_path("datasets.qdf") do
+    its(:stdout){ should match /OK|Created/ }
+    its(:stderr){ should be_blank }
   end
   
-  it "should upload spec/fixtures/data/metadata.qdf" do
-    Quandl::Logger.should_receive(:info).with(/OK|Created/).exactly(3).times
-    Quandl::Command::Tasks::Upload.call( 'spec/fixtures/data/metadata.qdf' )
+  context data_path("metadata.qdf") do
+    its(:stdout){ should match /OK|Created/ }
+    its(:stderr){ should be_blank }
   end
   
-  it "should upload spec/fixtures/data/QUGC-42.qdf" do
-    Quandl::Logger.should_receive(:info).with(/OK|Created/).exactly(1).times
-    Quandl::Command::Tasks::Upload.call( 'spec/fixtures/data/QUGC-42.qdf' )
+  context data_path("QUGC-42.qdf") do
+    its(:stdout){ should match /OK|Created/ }
+    its(:stderr){ should be_blank }
   end
   
-  def self.it_should_expect_error(file, error)
-    it "#{file}.qdf should error with #{error}" do
-      Quandl::Logger.should_receive(:error).with(error).exactly(1).times
-      Quandl::Command::Tasks::Upload.call( "spec/fixtures/data/errors/#{file}.qdf" )
-    end
+  context error_path("invalid_code.qdf") do
+    its(:stdout){ should match /Unprocessable Entity/ }
+  end
+  
+  context error_path("column_count_mismatch.qdf") do
+    its(:stdout){ should match /Found 4 but expected 3 based on/ }
+  end
+  
+  context error_path("date_parse_error.qdf") do
+    its(:stdout){ should match /Invalid date segments/ }
+  end
+  
+  context error_path("invalid_date.qdf") do
+    its(:stdout){ should match /Invalid date/ }
+  end
+  
+  context error_path("invalid_dash.qdf") do
+    its(:stdout){ should match /Unprocessable Entity | Error | Psych::SyntaxError | Error parsing metadata. Could not find expected ':' on line 3./ }
   end
   
-  it_should_expect_error :invalid_code,            /code is invalid/
-  it_should_expect_error :column_count_mismatch,   /Expected 4 but found 5 based/
-  it_should_expect_error :date_parse_error,        /DateParseError/
-  it_should_expect_error :invalid_date,            /InvalidDate/
-  it_should_expect_error :psych,                   /Could not find expected ':'/
-  it_should_expect_error :unknown_attribute,       /UnknownAttribute/
+  context error_path("psych.qdf") do
+    its(:stdout){ should match /Could not find expected ':'/ }
+  end
+  
+  context error_path("unknown_attribute.qdf") do
+    its(:stdout){ should match /UnknownAttribute/ }
+  end
+  
+  context "json" do
+  
+    let(:prefix){ "upload" }
+    let(:command){ self.class.superclass.description }
+    subject{
+      result = quandl( [prefix, command, "-F json"].flatten.join(" ") )
+      OpenStruct.new(
+        stdout:       result.stdout,
+        stderr:       result.stderr,
+        stdout_json:  result.stdout.split("\n").collect{|l| JSON.parse(l) },
+      )
+    }
   
-  # delete test data after run
-  after(:all){ Quandl::Format::Dataset.load_from_file('spec/fixtures/data/datasets.qdf')
-    .collect(&:client).each(&:destroy) }
+    context data_path("metadata.qdf") do
+      its(:stderr){ should be_blank }
+      its(:stdout_json){ should be_a Array }
+      its('stdout_json.first'){ should have_key 'status' }
+      its('stdout_json.first'){ should have_key 'id' }
+      its('stdout_json.first'){ should have_key 'detail' }
+      its('stdout_json.first'){ should have_key 'message' }
+      its('stdout_json.first'){ should have_key 'attributes' }
+    end
+  
+    context error_path("unknown_attribute.qdf") do
+      its('stdout_json.first'){ should have_key 'status' }
+      its('stdout_json.first'){ should have_key 'id' }
+      its('stdout_json.first'){ should have_key 'detail' }
+      its('stdout_json.first'){ should have_key 'message' }
+      its(:stdout_json){ should eq([{"status"=>"Unprocessable Entity", "id"=>"Error", "detail"=>"Quandl::Error::UnknownAttribute", "message"=>"UNKNOWN_ATTRIBUTE_CODE_2 error around line 13\nUnknown Field 'this_attribute_does_not_exist' valid fields are: source_code, code, name, description, private, reference_url, frequency (Quandl::Error::UnknownAttribute)\n"}, {"status"=>"Unprocessable Entity", "id"=>"Error", "detail"=>"Quandl::Error::UnknownAttribute", "message"=>"UNKNOWN_ATTRIBUTE_CODE_3 error around line 25\nUnknown Field 'horse' valid fields are: source_code, code, name, description, private, reference_url, frequency (Quandl::Error::UnknownAttribute)\n"}, {"status"=>"Unprocessable Entity", "id"=>"Error", "detail"=>"Quandl::Error::UnknownAttribute", "message"=>"UNKNOWN_ATTRIBUTE_CODE_4 error around line 37\nUnknown Field 'mouse' valid fields are: source_code, code, name, description, private, reference_url, frequency (Quandl::Error::UnknownAttribute)\n"}]) }
+    end
+  
+  end
   
 end

data/spec/lib/quandl/command_spec.rb

@@ -2,14 +2,6 @@
 require 'spec_helper'
 require 'open3'
 
-def quandl(statement)
-  version = "#{RUBY_VERSION}-p#{RUBY_PATCHLEVEL}"
-  path = File.join(Quandl::Command::Tasks.root, 'bin/quandl')
-  command = "rvm #{version} do bundle exec #{path} #{statement} --token #{ENV['QUANDL_TEST_TOKEN']} --url #{ENV['QUANDL_TEST_URL']} "
-  stdin, stdout, stderr = Open3.popen3(command)
-  OpenStruct.new( stderr: stderr.read, stdout: stdout.read )
-end
-
 describe "./bin/quandl" do
   
   let(:command){ self.class.superclass.description }
@@ -31,7 +23,7 @@ describe "./bin/quandl" do
   end
   
   context "delete TEST_1 TEST_5 TEST_15 --force-yes" do
-    its(:stdout){ should match 'Deleted' }
+    its(:stdout){ should match 'OK' }
   end
   
   context "info" do

data/spec/spec_helper.rb

@@ -8,13 +8,48 @@ require 'factory_girl'
 require 'pry'
 require 'commander'
 require 'quandl/command'
+require 'open3'
 
 # disable log output
-Quandl::Logger.use(Quandl::Logger::Outputs)
+class TestOutput
+  
+  class << self
+    def info(*args)
+      puts(*args)
+    end
+    def fatal(*args)
+      puts(*args)
+    end
+    def error(*args)
+      puts(*args)
+    end
+    def debug(*args)
+      puts(*args)
+    end
+  end
+  
+end
+Quandl::Logger.use(TestOutput)
 
 factory_dir = File.join( File.dirname(__FILE__), 'factories/**/*.rb' )
 Dir.glob( factory_dir ).each{|f| require(f); puts f }
 
 RSpec.configure do |config|
   config.include FactoryGirl::Syntax::Methods
+end
+
+def quandl(statement)
+  version = "#{RUBY_VERSION}-p#{RUBY_PATCHLEVEL}"
+  path = File.join(Quandl::Command::Tasks.root, 'bin/quandl')
+  command = "bundle exec #{path} #{statement} --token #{ENV['QUANDL_TEST_TOKEN']} --url #{ENV['QUANDL_TEST_URL']}  --force-yes --trace"
+  stdin, stdout, stderr = Open3.popen3(command)
+  OpenStruct.new( stderr: stderr.read, stdout: stdout.read )
+end
+
+def data_path(path)
+  File.join("spec/fixtures/data/", path)
+end
+
+def error_path(path)
+  File.join("spec/fixtures/data/errors/", path)
 end

data/tasks/toolbelt/build/tarball.rb

@@ -28,7 +28,7 @@ class Tasks::Toolbelt::Build::Tarball < Tasks::Toolbelt
   
   def copy_files_into_release
     # for each path
-    ['lib', 'bin', 'config'].each do |path|
+    ['lib', 'bin', 'config', 'VERSION'].each do |path|
       # recursively copy into release
       cp_r File.join( root_path, path ), File.join( release_path, path )
     end
@@ -41,7 +41,7 @@ class Tasks::Toolbelt::Build::Tarball < Tasks::Toolbelt
   end
   
   def append_revision_to_release_version
-    version_file = File.join( release_path, 'lib/quandl/command/version.rb')
+    version_file = File.join( release_path, 'VERSION')
     IO.write(version_file, File.open(version_file) do |f|
       f.read.gsub(version, "#{version}-#{revision}")
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: quandl
 version: !ruby/object:Gem::Version
-  version: 0.2.27
+  version: 0.3.0
 platform: ruby
 authors:
 - Blake Hilscher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-28 00:00:00.000000000 Z
+date: 2014-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -30,42 +30,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.8
+        version: 0.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.8
+        version: 0.4.2
 - !ruby/object:Gem::Dependency
   name: quandl_client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.5.1
+        version: 2.7.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.5.1
+        version: 2.7.4
 - !ruby/object:Gem::Dependency
   name: quandl_data
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.9
+        version: 1.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.9
+        version: 1.4.1
 - !ruby/object:Gem::Dependency
   name: quandl_operation
   requirement: !ruby/object:Gem::Requirement
@@ -262,6 +262,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '4.2'
+- !ruby/object:Gem::Dependency
+  name: quandl_utility
+  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'
 description: http://quandl.com/help/toolbelt
 email:
 - blake@hilscher.ca
@@ -278,6 +292,7 @@ files:
 - README.md
 - Rakefile
 - UPGRADE.md
+- VERSION
 - bin/quandl
 - config/locales/en.yml
 - dist/resources/pkg/Distribution.erb
@@ -290,14 +305,36 @@ files:
 - lib/quandl/command/client_ext.rb
 - lib/quandl/command/client_ext/user.rb
 - lib/quandl/command/compatibility_check.rb
-- lib/quandl/command/qconfig.rb
+- lib/quandl/command/config.rb
+- lib/quandl/command/presenter.rb
+- lib/quandl/command/presenter/record.rb
+- lib/quandl/command/presenters/dataset_presenter.rb
+- lib/quandl/command/presenters/error_presenter.rb
+- lib/quandl/command/presenters/nil_class_presenter.rb
+- lib/quandl/command/presenters/scraper_presenter.rb
+- lib/quandl/command/presenters/superset_presenter.rb
+- lib/quandl/command/task.rb
+- lib/quandl/command/task/callbacks.rb
+- lib/quandl/command/task/clientable.rb
+- lib/quandl/command/task/commandable.rb
+- lib/quandl/command/task/configurable.rb
+- lib/quandl/command/task/inputable.rb
+- lib/quandl/command/task/logging.rb
+- lib/quandl/command/task/presentation.rb
+- lib/quandl/command/task/reportable.rb
+- lib/quandl/command/task/threading.rb
+- lib/quandl/command/task/translations.rb
+- lib/quandl/command/task/updatable.rb
 - lib/quandl/command/tasks.rb
-- lib/quandl/command/tasks/base.rb
 - lib/quandl/command/tasks/delete.rb
 - lib/quandl/command/tasks/download.rb
 - lib/quandl/command/tasks/info.rb
 - lib/quandl/command/tasks/list.rb
 - lib/quandl/command/tasks/login.rb
+- lib/quandl/command/tasks/replace.rb
+- lib/quandl/command/tasks/schedule.rb
+- lib/quandl/command/tasks/search.rb
+- lib/quandl/command/tasks/superset.rb
 - lib/quandl/command/tasks/uninstall.rb
 - lib/quandl/command/tasks/update.rb
 - lib/quandl/command/tasks/upload.rb
@@ -310,8 +347,12 @@ files:
 - scripts/compile_ruby_pkg.sh
 - scripts/install.sh
 - scripts/win/quandl_toolbelt.iss
+- spec/fixtures/scraper.rb
 - spec/lib/quandl/command/delete_spec.rb
 - spec/lib/quandl/command/download_spec.rb
+- spec/lib/quandl/command/replace_spec.rb
+- spec/lib/quandl/command/schedule_spec.rb
+- spec/lib/quandl/command/superset_spec.rb
 - spec/lib/quandl/command/upload_spec.rb
 - spec/lib/quandl/command_spec.rb
 - spec/spec_helper.rb
@@ -350,8 +391,12 @@ signing_key:
 specification_version: 4
 summary: Quandl Toolbelt
 test_files:
+- spec/fixtures/scraper.rb
 - spec/lib/quandl/command/delete_spec.rb
 - spec/lib/quandl/command/download_spec.rb
+- spec/lib/quandl/command/replace_spec.rb
+- spec/lib/quandl/command/schedule_spec.rb
+- spec/lib/quandl/command/superset_spec.rb
 - spec/lib/quandl/command/upload_spec.rb
 - spec/lib/quandl/command_spec.rb
 - spec/spec_helper.rb

data/lib/quandl/command/qconfig.rb

@@ -1,86 +0,0 @@
-require 'fileutils'
-require 'yaml'
-require 'ostruct'
-
-module Quandl
-module Command
-class QConfig
-  
-  class << self
-    
-    def configuration
-      @configuration ||= self.new( config_file: config_file )
-    end
-    
-    def config_file
-      return @config_file if defined?(@config_file)
-      @config_file = File.join(root_path, 'config')
-      convert_legacy_config
-      ensure_directory_is_present
-      @config_file
-    end
-    
-    def root_path
-      @root_path ||= File.join(ENV['HOME'], '.quandl')
-    end
-    
-    protected
-    
-    def ensure_directory_is_present
-      return if File.exists?(config_file)
-      FileUtils.mkdir(root_path) unless Dir.exists?(root_path)
-      File.write( config_file, YAML.dump({}) )
-    end
-    
-    def convert_legacy_config
-      return if File.directory?(root_path) || !File.exists?(root_path)
-      # otherwise move the old .quandl into .quandl/config
-      FileUtils.mv(root_path, "#{root_path}.old")
-      FileUtils.mkdir(root_path)
-      token = File.read("#{root_path}.old")
-      File.write(config_file, "token: #{token}")
-    end
-    
-    def define_attributes(*attr_names)
-      attr_names.each do |attr_name|
-        define_attribute(attr_name)
-      end
-    end
-    
-    def define_attribute(name)
-      define_method(name){ read_attribute(name) }
-      define_method("#{name}="){|v| write_attribute(name, v) }
-    end
-    
-  end
-  
-  attr_accessor :options
-  
-  define_attributes :token, :quandl_url, :last_checked_for_update
-  
-  def initialize(*args)
-    self.options = OpenStruct.new(args.extract_options!)
-  end
-  
-  def config
-    @config ||= OpenStruct.new(YAML.load(File.read(options.config_file)))
-  end
-  
-  private
-  
-  def read_attribute(name)
-    config.send(name)
-  end
-  
-  def write_attribute(name, value)
-    config.send("#{name}=", value)
-    commit_config
-  end
-  
-  def commit_config
-    File.write( options.config_file, YAML.dump(config.marshal_dump) )
-  end
-  
-end
-end
-end