quandl 0.4.0 → 0.4.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MWZhODVmN2E1YzI4MTVhNDdlZDBjNmExOWUzNDYzMDM3M2IwNTNhMw==
+    NDE0ZTgyNWUyNmExYWE1YWFiMTdmNTU1ZWVkNDA1MDQ4MWIxMTI2YQ==
   data.tar.gz: !binary |-
-    ZTNhZmQ0OGI3MmNiNzQyZTQxYTA5YzYzMjQzMzcyN2QxNDVmMWNiOA==
+    ZGI0ZDZiYjVlYzI3N2QxMDE2ZTNhNzg2ZjZlMTdlYzUwYjM5MGYyZQ==
 SHA512:
   metadata.gz: !binary |-
-    MDI5MjJhNDQwZjU5YTE1MmU0YTJjN2FiNDAwYWFkNmY2YTA2NTk3YzQ4ZTM5
-    OTIyYzAzZjhmNjYyNjJiYWNiYzBjOTgwMzA2OTkzZGIxMzkwOGVhODU0MGY1
-    MmEzNmZmZGZjZjJhZTA1ZmFhZGU2MjhhZTcwYzM1YmUwMDhkMDc=
+    Njc4M2NiMjg3ZGJiMzA1MzYyYWJhYzFlZWQyMzkzMTA4YTUyMWRkMTA4MzM0
+    YzJkODQyODk5MDRmYWQ0NjhiYjc4YzVlZDEzZjgxYWI4NWU2YTQwZDlkMDIx
+    ODc0ZDYyNjFmOGM5NDc3N2ViNDI0YThiYTdjZDMxMDYyMDZjZjQ=
   data.tar.gz: !binary |-
-    MDM2MDRhOTRlMTkzN2I4ZTJlZGI0MGEwNGExMjVmNGE5MzdkMzYzOWRmN2Uy
-    Zjk1MDRlOTJkNmZjZTVjYmJmODRiNTE5MzczNDhlMGE4OTExMjI1NTQ0OGI4
-    ODBiMzA4ZjNjOTFjOWEzNTllMTU1ZTc2YzVhZDU0Zjc2YzRhMDY=
+    ZjQ1NjNjZGJjNmE3NGVjYjhlYWYxNDFkNmNhM2I4MTk0NjRjZmVkZTY5YjNm
+    YTg3MWY1YWMwM2RjZDEyNmU5ZTVlOTZjY2VlYTkwYWY2MWQ3NzQ5OGFhODkx
+    NzkwNDA2NjFmY2MxOTg0MDA0MWM4M2Y0ZTE0ODFjNDdhZTYyYjQ=

data/UPGRADE.md

@@ -1,3 +1,9 @@
+## 0.4.1 
+
+* added schedule run (now) feature
+
+
+
 ## 0.4.0 
 
 * QUGC-166 fix quandl schedule list --token incorrect_token

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.1

data/lib/quandl/command/tasks/schedule.rb

@@ -12,7 +12,8 @@ class Quandl::Command::Tasks::Schedule < Quandl::Command::Task
   
     schedule list      [FILE]
     schedule add       RUN_FILE [DEPENDENT_FILE1] [DEPENDENT_FILE2] [--at TIME]
-    schedule delete    FILE
+    schedule delete    SCRIPT
+    schedule run       SCRIPT
 
   EXAMPLES:
   
@@ -21,6 +22,12 @@ class Quandl::Command::Tasks::Schedule < Quandl::Command::Task
 
     $ quandl schedule add scraper.rb helper.txt helper2.txt --at "7pm Monday"
     You have successfully scheduled scraper.rb to run alongside helper.txt, helper2.txt. [weekly scraper]
+
+    $ quandl schedule deleted scraper.rb
+    You have successfully deleted scraper.rb.
+
+    $ quandl schedule run scraper.rb
+    Your scraper.rb will run immediately.
   }
 
   options({
@@ -47,7 +54,8 @@ class Quandl::Command::Tasks::Schedule < Quandl::Command::Task
       (info("'#{name}' does not exist "); return;) if scraper.blank?
       script_info scraper
     else
-      scrapers.each { |x| script_info x}
+      # create new blank scope and iterate over all pages
+      Quandl::Client::Scraper.scope.new.each_in_page{|x| script_info(x) }
     end
   end
 
@@ -88,6 +96,22 @@ class Quandl::Command::Tasks::Schedule < Quandl::Command::Task
 
   end
 
+  def run
+    (info("'#{name}' does not exist "); return;) if scraper.blank?
+    info("You are about to run '#{scraper.name}'")
+    return unless confirmed?
+    result=scraper.run_now if scraper.respond_to?(:run_now)
+    if result.valid?
+      info("Your '#{scraper.name}' will run immediately.")
+    else
+      if result.status == 429
+        info("You have exceeded your daily run limit.")
+      else
+        error "#{Quandl::Command::Presenter.pretty_errors(result.errors.messages).to_s.gsub("\n", ' ')}"
+      end
+    end
+
+  end
 
   #not supported for now
 =begin
@@ -124,9 +148,9 @@ class Quandl::Command::Tasks::Schedule < Quandl::Command::Task
   def schedule_message
     if options.at
       "Your script first run will happen in #{scraper.schedule_next}. It will continue to run #{scraper.schedule_run_time}
-Check your scrapers run status at #{quandl_url.gsub(/\/api\/?/,'')}/scrapers"
+Check your script run status at #{quandl_url.gsub(/\/api\/?/,'')}/schedule/#{scraper.id}"
     else
-      "It will run 3 times a day starting immediately.\nCheck your scrapers run status at #{quandl_url.gsub(/\/api\/?/,'')}/scrapers"
+      "It will run 3 times a day starting immediately.\nCheck your script run status at #{quandl_url.gsub(/\/api\/?/,'')}/schedule/#{scraper.id}"
     end
   end
 

data/lib/quandl/command/tasks/upload.rb

@@ -33,13 +33,14 @@ class Quandl::Command::Tasks::Upload < Quandl::Command::Task
     interface = file_path.present? ? File.open(file_path, "r") : $stdin
     # for each dataset streamed from interface
     Quandl::Format::Dataset.each_line(interface) do |dataset, error|
-      debug("started processing #{dataset.full_code}") if dataset.respond_to?(:full_code)
       # present error if given
       next present( error ) unless error.nil?
       # process in background using thread key
       background_job do
         # upload
+        t1 = Time.now
         upload( dataset )
+        debug("#{dataset.full_code.to_s.ljust(20)} #{t1.elapsed_ms}") if dataset.respond_to?(:full_code)
       end
     end
   end

data/quandl.gemspec

@@ -19,12 +19,12 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency "commander", '4.1.5'
   
-  s.add_runtime_dependency "quandl_format", "0.4.3"
-  s.add_runtime_dependency "quandl_client", '2.8.0'
-  s.add_runtime_dependency "quandl_data", '1.4.1'
-  s.add_runtime_dependency "quandl_operation", '0.3.2'
+  s.add_runtime_dependency "quandl_format", "0.5.0"
+  s.add_runtime_dependency "quandl_client", '2.10.0'
+  s.add_runtime_dependency "quandl_data", '1.5.1'
+  s.add_runtime_dependency "quandl_operation", '0.4.1'
   s.add_runtime_dependency "quandl_babelfish", '0.0.11'
-  s.add_runtime_dependency "quandl_logger", '0.2.6'
+  s.add_runtime_dependency "quandl_logger", '0.3.1'
   s.add_runtime_dependency "json", '1.7.7'
   s.add_runtime_dependency "minitar", '0.5.4'
   s.add_runtime_dependency "thread", "0.1.3"

data/spec/config/output.rb

@@ -0,0 +1,21 @@
+
+# disable log output
+class Spec::Config::Output
+  
+  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(Spec::Config::Output)

data/spec/config/quandl.rb

@@ -0,0 +1,16 @@
+require 'ostruct'
+require 'yaml'
+
+module Spec
+module Config
+  Quandl = OpenStruct.new(YAML.load(File.read(File.join(ENV['HOME'], '.quandl/test'))))
+end
+end
+
+require "quandl/client"
+require "quandl/fabricate"
+
+include Quandl::Client
+
+Quandl::Client.token = Spec::Config::Quandl.token
+Quandl::Client.use( Spec::Config::Quandl.quandl_url )

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

@@ -28,7 +28,7 @@ describe Quandl::Command::Tasks::Delete do
     before(:each){ Quandl::Command::Tasks::Upload.call( 'spec/fixtures/data/datasets.qdf' ) }
 
     it "should delete spec/fixtures/data/datasets.qdf" do
-      TestOutput.should_receive(:info).with(/Deleted/).at_least(4).times
+      Spec::Config::Output.should_receive(:info).with(/Deleted/).at_least(4).times
       datasets = Quandl::Format::Dataset.load_from_file('spec/fixtures/data/datasets.qdf')
       datasets.each{|d| Quandl::Command::Tasks::Delete.call( d.code, force_yes: true ) }
     end
@@ -36,7 +36,7 @@ describe Quandl::Command::Tasks::Delete do
     it "should not download" do
       datasets = Quandl::Format::Dataset.load_from_file('spec/fixtures/data/datasets.qdf')
       datasets.each{|d| Quandl::Command::Tasks::Delete.call( d.code, force_yes: true ) }
-      TestOutput.should_receive(:info).with(nil).at_least(4).times
+      Spec::Config::Output.should_receive(:info).with(nil).at_least(4).times
       datasets.each{|d| Quandl::Command::Tasks::Download.call( d.code ) }
     end
     

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

@@ -1,8 +1,6 @@
 # encoding: utf-8
 require 'spec_helper'
 
-replace_string = "source_code: BLAKEHIL\ncode: SCRAPER_TEST_1394485290783983\nname: Untitled Dataset 2014-04-04 13:08:49\ndescription: This dataset has no description.\nprivate: false\nreference_url: \nfrequency: daily\n-\nDate,High,Low,Settle\n2014-03-11,9.958,11.0,13.92\n\n"
-
 describe "./bin/quandl replace" do
   
   let(:prefix){ "replace" }
@@ -17,7 +15,8 @@ describe "./bin/quandl replace" do
   context "SCRAPER_TEST_1394485290783983" do
     let(:prefix){ "download" }
     
-    its(:stdout){ should eq replace_string }
+    its(:stdout){ should match "code: SCRAPER_TEST_1394485290783983" }
+    
   end
   
 end

data/spec/lib/quandl/command_spec.rb

@@ -27,7 +27,7 @@ describe "./bin/quandl" do
   end
   
   context "info" do
-    its(:stdout){ should match QuandlTestConfig.quandl_url }
+    its(:stdout){ should match Spec::Config::Quandl.quandl_url }
     its(:stderr){ should be_blank }
   end
   

data/spec/spec_helper.rb

@@ -3,44 +3,21 @@ $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
 require 'yaml'
 require 'ostruct'
 
-QuandlTestConfig = OpenStruct.new(YAML.load(File.read(File.join(ENV['HOME'], '.quandl/test'))))
- 
-ENV['QUANDL_TOKEN'] = QuandlTestConfig.token
-ENV['QUANDL_URL'] = QuandlTestConfig.quandl_url
+# require and configure quandl_client with test config
+require_relative 'config/quandl'
+
+ENV['QUANDL_TOKEN'] = Spec::Config::Quandl.token
+ENV['QUANDL_URL'] = Spec::Config::Quandl.quandl_url
 
 require "rspec"
 require 'factory_girl'
 require 'pry'
 require 'commander'
 require 'quandl/command'
-require 'quandl/client'
 require 'open3'
 
-include Quandl::Client
-
-Quandl::Client.token = QuandlTestConfig.token
-Quandl::Client.use QuandlTestConfig.quandl_url
- 
-# disable log output
-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)
+# configure Quandl::Logger to use Config::Output
+require_relative 'config/output'
 
 factory_dir = File.join( File.dirname(__FILE__), 'factories/**/*.rb' )
 Dir.glob( factory_dir ).each{|f| require(f); puts f }
@@ -52,7 +29,7 @@ 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 #{QuandlTestConfig.token} --url #{QuandlTestConfig.quandl_url}  --threads 1 --force-yes --trace --sandbox"
+  command = "bundle exec #{path} #{statement} --token #{Spec::Config::Quandl.token} --url #{Spec::Config::Quandl.quandl_url} --threads 1 --force-yes --trace --sandbox"
   stdin, stdout, stderr = Open3.popen3(command)
   OpenStruct.new( stderr: stderr.read, stdout: stdout.read )
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: quandl
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Blake Hilscher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-12 00:00:00.000000000 Z
+date: 2014-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -30,56 +30,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: quandl_client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.10.0
 - !ruby/object:Gem::Dependency
   name: quandl_data
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: 1.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: 1.5.1
 - !ruby/object:Gem::Dependency
   name: quandl_operation
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: quandl_babelfish
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.6
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.6
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -380,6 +380,8 @@ files:
 - scripts/compile_ruby_pkg.sh
 - scripts/install.sh
 - scripts/win/quandl_toolbelt.iss
+- spec/config/output.rb
+- spec/config/quandl.rb
 - spec/factories/dataset.rb
 - spec/factories/source.rb
 - spec/fixtures/scraper-test-file.rb
@@ -426,6 +428,8 @@ signing_key:
 specification_version: 4
 summary: Quandl Toolbelt
 test_files:
+- spec/config/output.rb
+- spec/config/quandl.rb
 - spec/factories/dataset.rb
 - spec/factories/source.rb
 - spec/fixtures/scraper-test-file.rb