morph-cli 0.0.2 → 0.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OWJhOGZjNjA0YmU1ZjliNDA2MjVhZDAxM2U2OWEwZWY1ZmQ2MjM0YQ==
+    Zjc1YjYxNThiZTIzZGNkMTY5MTI2MmYzMjFmNGVmOWZhNzg1YjkwOQ==
   data.tar.gz: !binary |-
-    MDNlODNhMzhjYmUzNjFkMTY0MGQ0ZmNjY2E2ZmQxNzFjYTdlOGEzNA==
+    ZDdkNzY4OWM4ZTAzNTg2NjA0NTgwYTg0NTRhYjJkZWExNmU5MmI2OQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NTZiZDJiYWVkYTBkOGU2YmZjZTU2ZjY5ZTEyZDY2ZGRlZDhmMzNlMDdlNzAz
-    OGIzZjcwNDFlZjkyYjkxZTc5ZGJjMTQ2ZWM0ZWVmOWRiZGQxMzI2MjI2OGU3
-    MzZiMGRiMTc4Y2Q5MTViYjc5MTUzYzRhOTc1NWZlNWQyYjM1ZmQ=
+    MGIxMDc2NGQ1ZTc4NzQ5ZDEyMzg5ZTQ1ZTk5MDdiNjYzN2QzNTM0ZTM3NWUy
+    Y2I3ZDNkNmVhOGRhYjQwZTIwMmE5ZWQ5ZjUxYWUwMGJhYTAzNDVjODg3ZDhm
+    YzY4ZmZmMzViZmRkMzI3NWRiMDdkMzRjMjIzMTBmNGVkMzY4N2U=
   data.tar.gz: !binary |-
-    ZDVlYWExY2VlN2NmNTg3NzM1MjdkMWM0ZTYzNzY2MzVjNGQ4MTMwNDdhOWE2
-    OTlkNDNhZTNmNzNhNDQ2NDAyZWQ0MDRjYTE0YjkwMWRmNTk2YWFlYWFlODZm
-    Y2U1OTExZTUwOTc4YTFlOTBjZmY4YTNhNDk2OGEwN2JjNzZjZWM=
+    YzM5YmNiNTk5NWI2NjYwYjA4ODU3YWIzZTA2ODYxYmQ1MjQxYTMyYzg4NWJk
+    Y2NiZDVkZGEwMGMxYzMyNTY4ZWQ1NWUwY2JjNjlmNzM5YmQxMmVjOWZmY2Uy
+    MTA4NzUyM2ExZTRjZTk2YzI3YTgyZjM0NjE1MDY3ZGRiYmIyZGM=

data/README.md

@@ -1,26 +1,37 @@
 [![Gem Version](https://badge.fury.io/rb/morph-cli.png)](http://badge.fury.io/rb/morph-cli)
 
-# Morph
+# Morph Commandline
 
-TODO: Write a gem description
+Runs Morph scrapers from the commandline.
 
-## Installation
+Actually it will run them on the Morph server identically to the real thing. That means not installing a bucket load of libraries
+and bits and bobs that are already installed with the Morph scraper environments.
+
+To run a scraper in your local directory
+
+    morph
+
+Yup, that's it.
 
-Add this line to your application's Gemfile:
+It runs the code that's there right now. It doesn't need to be checked into git or anything.
 
-    gem 'morph-cli'
+For help
+
+    morph help
+
+## Installation
 
-And then execute:
+You'll need Ruby >= 1.9 and then
 
-    $ bundle
+    gem install morph-cli
 
-Or install it yourself as:
+## Limitations
 
-    $ gem install morph-cli
+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.
 
-## Usage
+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
 
-TODO: Write usage instructions here
+It doesn't yet return you the resulting sqlite database.
 
 ## Contributing
 

data/lib/morph-cli.rb

@@ -4,19 +4,23 @@ module MorphCLI
   def self.execute(directory, development, env_config)
     puts "Uploading and running..."
     file = MorphCLI.create_tar(directory, MorphCLI.all_paths(directory))
-    result = RestClient.post("#{env_config[:base_url]}/run", :api_key => env_config[:api_key], :code => file)
-    # Interpret each line separately as json
-    result.split("\n").each do |line|
-      a = JSON.parse(line)
-      if a["stream"] == "stdout"
-        s = $stdout
-      elsif a["stream"] == "stderr"
-        s = $stderr
-      else
-        raise "Unknown stream"
+    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"
+          end
+          s.puts a["text"]
+        end
       end
-      s.puts a["text"]
     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.config_path

data/lib/morph-cli/version.rb

@@ -1,3 +1,3 @@
 module MorphCLI
-  VERSION = "0.0.2"
+  VERSION = "0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: morph-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: '0.1'
 platform: ruby
 authors:
 - Matthew Landauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-30 00:00:00.000000000 Z
+date: 2014-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor