morph-cli 0.1.1 → 0.2

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    Y2Y3ODM5MWExMjM3ZTlmOWIzOTViZGU1ZDNhZTNlYzY0MWVlZTExYw==
-  data.tar.gz: !binary |-
-    NjdmZTFlN2VhY2M3OGQ4Zjc4M2YwY2EwZDUxZmNmYWY0Y2M4ZGRkZQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    ZDBmOWUwNmVmMmQyYWMyNTU0YjJhNGFhMTc3NjI0YWRhYjBkZmVkZDYxM2Y2
-    YmFlMGM1NTAzZTRjNzc2NGI3YjYzZDEzZmUxN2ExODlmOWIwNDJmNjU4OTE1
-    OTE3NWMxMTliNzliNmNhZGI4Y2VlN2Q2NGEzOWRmNWZiODgwZTE=
-  data.tar.gz: !binary |-
-    MzEyM2YxNWM0OWE3MjU0YTYxOWFlZWJiZTVmMzMwZmY1MDJjYjc0MTAyYmFl
-    ZDE0MDhjYmZiNjk3YjRkMDY5NGFiZmExNTU4YjY5OTEyMTI3YzNmYjRkNGRk
-    NTYxN2M3NGJkYmI4MThmODU0OGM3MTUwOWE5ZDExMGRjMGM4Mjk=
+SHA1:
+  metadata.gz: c0932626e313e4ee80b17d631519b81f0e4eb9e8
+  data.tar.gz: 883d175ab5a5f4f609a60d88240d5ab0b796671a
+SHA512:
+  metadata.gz: 1b75dd9bfe882d92fd24f4d624f9c83fcd0bb44d83fdbeb5d27228cc54146c05f68d789475644b798375c022d35723c3b9693824c11dd1bdc0c7058d55dc7d8b
+  data.tar.gz: d1471f8bfe7a5d04e3291f50d599d7d8cab0a9d49fa42a1e986ad645ade3eb0903e0843637f3830f09b4d44968f22bff074d466b1af279975a2688ea6312004e

data/README.md

@@ -27,11 +27,9 @@ You'll need Ruby >= 1.9 and then
 
 ## Limitations
 
-It doesn't currently stream the console output from the Morph server so you have to wait until the scraper has finished running before you see the output. I want to add streaming as soon as possible because it will make this a whole lot more responsive and usable.
-
 It uploads your code everytime. So if it's big it might take a little while. Scrapers are not usually so I'm hoping this won't really be an issue
 
-It doesn't yet return you the resulting sqlite database.
+It doesn't yet return you the resulting sqlite database (or use the one you might have locally)
 
 ## Contributing
 

data/bin/morph

@@ -11,7 +11,7 @@ require 'json'
 require 'morph-cli'
 
 class MorphThor < Thor
-  class_option :dev, default: false, type: :boolean, desc: "Run against a local dev of Morph"
+  class_option :dev, default: false, type: :boolean, desc: "Run against development Morph (for morph developers)"
 
   desc "[execute]", "execute morph scraper"
   option :directory, :default => Dir.getwd
@@ -44,6 +44,12 @@ class MorphThor < Thor
     end
   end
 
+  desc "version", "Show Morph version number and quit"
+  def version
+    puts "Morph CLI #{MorphCLI::VERSION}"
+    exit
+  end
+
   no_commands {
     def ask_and_save_api_key(env_config, config)
       env_config[:api_key] = ask("What is your key? (Go to #{env_config[:base_url]}/settings)")

data/lib/morph-cli.rb

@@ -5,25 +5,42 @@ module MorphCLI
   def self.execute(directory, development, env_config)
     puts "Uploading and running..."
     file = MorphCLI.create_tar(directory, MorphCLI.all_paths(directory))
+    buffer = ""
     block = Proc.new do |http_response|
-      http_response.read_body do |line|
-        unless line.empty?
-          a = JSON.parse(line)
-          if a["stream"] == "stdout"
-            s = $stdout
-          elsif a["stream"] == "stderr"
-            s = $stderr
-          else
-            raise "Unknown stream"
+      if http_response.code == "200"
+        http_response.read_body do |line|
+          before, match, after = line.rpartition("\n")
+          buffer += before + match
+          buffer.split("\n").each do |l|
+            log(l)
           end
-          s.puts a["text"]
+          buffer = after
         end
+      elsif http_response.code == "401"
+        raise RestClient::Unauthorized
+      else
+        puts http_response.body
+        exit(1)
       end
     end
     result = RestClient::Request.execute(:method => :post, :url => "#{env_config[:base_url]}/run",
       :payload => {:api_key => env_config[:api_key], :code => file}, :block_response => block)
   end
-  
+
+  def self.log(line)
+    unless line.empty?
+      a = JSON.parse(line)
+      if a["stream"] == "stdout"
+        s = $stdout
+      elsif a["stream"] == "stderr"
+        s = $stderr
+      else
+        raise "Unknown stream"
+      end
+      s.puts a["text"]
+    end
+  end
+
   def self.config_path
     File.join(Dir.home, ".morph")
   end
@@ -85,7 +102,7 @@ module MorphCLI
         end
       else
         result << Pathname.new(path).relative_path_from(Pathname.new(directory)).to_s
-      end      
+      end
     end
     result
   end

data/lib/morph-cli/version.rb

@@ -1,3 +1,3 @@
 module MorphCLI
-  VERSION = "0.1.1"
+  VERSION = "0.2"
 end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: morph-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: '0.2'
 platform: ruby
 authors:
 - Matthew Landauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-05 00:00:00.000000000 Z
+date: 2014-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: archive-tar-minitar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -70,14 +70,14 @@ dependencies:
   name: rake
   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: Command line interface for Morph
@@ -108,17 +108,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Command line interface for Morph