quandl_sandbox 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 191b24f362d9b5c0144dd44ffcf008ae39d84cad
-  data.tar.gz: 9c33e859a5685e26b2d28e2f0b95d5b5d967b697
+  metadata.gz: 6e0dc5f353591da55a850a0076ba20382193fef0
+  data.tar.gz: e1089e784ea2d9e405f6fe10b4fe3329b0b4c095
 SHA512:
-  metadata.gz: 8b309b71cccc432a123e7025a4a0d5a7a8217d84f1d62ea9cdb41e1f4b23b98e031038722e92e3a245490df825c926dfa293aabb5758a05193539bc772b5d921
-  data.tar.gz: 6d802be7e7936959ef883453ed55a1e868ea020c63197f59d144103a8624d2cd154aa58ffabbe1c94c0608404be835c216ca327b02fa12f27991ad1673eb3078
+  metadata.gz: 8e318b6cb4718e4bea0f2bd2e802772cb179cfedce2a1f21ef58ed6f2fe7d8bcdc715c72043e6dce914b21a6ae22057d3b74798aba816d59646b85e16af1e90c
+  data.tar.gz: 9d1989f9164b8252a74c83d22ac348702a37cc0bc9938af30346d7d9528b1cf5e3e7775a9eb0ebdec8cdb0bf5c4267e478023561a41ad5d65c4524545f5d57cd

data/lib/quandl/sandbox/dataset.rb

@@ -9,7 +9,7 @@ class Quandl::Sandbox::Dataset
   end
   
   def initialize(output)
-    rows = output.to_s.rstrip.split("\n")
+    rows = output.split("\n")
     self.full_code = rows.shift.strip
     self.name = rows.shift.strip
     self.description = rows.shift.strip

data/lib/quandl/sandbox/ec2.rb

@@ -16,7 +16,7 @@ class Quandl::Sandbox::EC2
     end
     
     def instances
-      interface.instances.filter('subnet-id', Sandbox.configuration.subnet_id )
+      interface.instances.filter('subnet-id', Quandl::Sandbox.configuration.subnet_id )
     end
     
     def gateway_reset!
@@ -31,17 +31,17 @@ class Quandl::Sandbox::EC2
     end
     
     def gateway_user
-      @gateway_user ||= Sandbox.configuration.ssh_gateway.split("@").first
+      @gateway_user ||= Quandl::Sandbox.configuration.ssh_gateway.split("@").first
     end
     
     def gateway_host
-      @gateway_host ||= Sandbox.configuration.ssh_gateway.split("@").last
+      @gateway_host ||= Quandl::Sandbox.configuration.ssh_gateway.split("@").last
     end
     
     def interface
       @interface ||= AWS::EC2.new(
-        access_key_id:      Sandbox.configuration.aws_access_key_id,
-        secret_access_key:  Sandbox.configuration.aws_secret_access_key)
+        access_key_id:      Quandl::Sandbox.configuration.aws_access_key_id,
+        secret_access_key:  Quandl::Sandbox.configuration.aws_secret_access_key)
     end
   
   end

data/lib/quandl/sandbox/job.rb

@@ -13,8 +13,6 @@ class Quandl::Sandbox::Job
   end
   
   def execute
-    # ensure the ssh daemon has started
-    server.ensure_connection_established!
     # run commands that need to happen before importer
     server.exec( repository.script.before_execute )
     # execute importer

data/lib/quandl/sandbox/server/instance.rb

@@ -21,7 +21,7 @@ module Quandl::Sandbox::Server::Instance
 
     def find(uid)
       # lookup instance
-      instance = Sandbox::EC2.find(uid)
+      instance = Quandl::Sandbox::EC2.find(uid)
       # build server given instance
       instance.present? ? self.new( instance: instance ) : nil
     end
@@ -33,7 +33,7 @@ module Quandl::Sandbox::Server::Instance
     end
     
     def delete(id)
-      i = Sandbox::EC2.find(id)
+      i = Quandl::Sandbox::EC2.find(id)
       i.present? ? i.delete : false
     end
 
@@ -61,9 +61,6 @@ module Quandl::Sandbox::Server::Instance
   end
 
   def launch!
-    # only new servers can be launched
-    return false unless new_record
-    # create, tag, wait
     self.instance = create_instance!
     add_tags_to_instance
   end
@@ -92,7 +89,7 @@ module Quandl::Sandbox::Server::Instance
   end
 
   def create_instance!
-    Sandbox::EC2.instances.create({
+    Quandl::Sandbox::EC2.instances.create({
       image_id:             image,
       subnet_id:            subnet_id,
       availability_zone:    availability_zone,

data/lib/quandl/sandbox/server/ssh.rb

@@ -2,8 +2,21 @@ module Quandl::Sandbox::Server::SSH
 
   extend ActiveSupport::Concern
   
-  def ensure_connection_established!
-    Sandbox::EC2.auto_retry(3){ exec("hostname") }
+  def launch!
+    # only new servers can be launched
+    return false unless new_record
+    # launch instance
+    super if defined?(super)
+    # wait for sshd to start on server
+    await_sshd_uninterruptedly
+  end
+  
+  def await_sshd_uninterruptedly
+    t1 = Time.now
+    Quandl::Logger.debug("#{instance_id}: await_sshd_uninterruptedly")
+    @await_sshd_uninterruptedly ||= Quandl::Sandbox::EC2.auto_retry(3){ exec("hostname") }
+    Quandl::Logger.debug "#{instance_id}: await_sshd_uninterruptedly finished (#{t1.elapsed_ms})"
+    @await_sshd_uninterruptedly
   end
   
   def upload!(local_path, remote_path="/home/ubuntu/")
@@ -44,21 +57,21 @@ module Quandl::Sandbox::Server::SSH
       end
       channel.wait
     end
+    result[:stdout] = result[:stdout].to_s.strip.rstrip
+    result[:stderr] = result[:stderr].to_s.strip.rstrip
     result
   end
   
   def ssh(&block)
-    # wait for server to be ready
+    # wait for server to launch
     await_instance_uninterruptedly unless running?
-    # establish connection
-    Quandl::Logger.debug "#{instance_id}: Waiting for sshd to start ... "
     # execute block through tunnel
     output = nil
-    Sandbox::EC2.gateway.ssh( private_ip_address, ssh_user,
-      key_data: Sandbox.configuration.key_data, keys_only: true ) do |ssh|
+    Quandl::Sandbox::EC2.gateway.ssh( private_ip_address, ssh_user,
+      key_data: Quandl::Sandbox.configuration.key_data, keys_only: true ) do |ssh|
       output = block.call(ssh)
     end
     output
   end
-
+  
 end

data/lib/quandl/sandbox/version.rb

@@ -1,5 +1,5 @@
 module Quandl
 module Sandbox
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end
 end

data/spec/lib/quandl/sandbox/job_spec.rb

@@ -23,7 +23,6 @@ describe Quandl::Sandbox::Job do
       its('data.count'){ should eq 10 }
       its('data.first.count'){ should eq 4 }
     end
-    
-    
+
   end
 end

data/spec/lib/quandl/sandbox/server_spec.rb

@@ -51,7 +51,7 @@ describe Quandl::Sandbox::Server do
     describe "#exec" do
       it "should get the hostname" do
         # get internal_ip through exec('hostname')
-        internal_ip = subject.exec('hostname').rstrip.split('-')[1..-1].join('.')
+        internal_ip = subject.exec('hostname')[:stdout].split('-')[1..-1].join('.')
         # compare against private ip address
         subject.private_ip_address.should eq internal_ip
       end

data/spec/spec_helper.rb

@@ -28,11 +28,12 @@ RSpec.configure do |config|
 end
 
 def stubbed_job_output
-  4.times.collect do |i|
+  { stdout: 4.times.collect do |i|
     "QUANDL_SANDBOX_TEST/DATASET_#{i}\n" +
     "Test Dataset #{i}\n" +
     "Description of the dataset #{i}\n" +
     "Date, High, Low, Average\n" +
     "#{Quandl::Fabricate::Data.rand(rows: 10, columns: 3).to_csv}}"
   end.join("----\n")
+  }
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quandl_sandbox
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Blake Hilscher