morph-cli 0.0.1 → 0.0.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTg4MTEwYzQ4ZDMyMWVkNjg1ZDk4MDY0YzllZTQ1ODhjOTFlOWQ3MA==
+    OWJhOGZjNjA0YmU1ZjliNDA2MjVhZDAxM2U2OWEwZWY1ZmQ2MjM0YQ==
   data.tar.gz: !binary |-
-    Y2U0NGJkMDU5MTdhNWNmMjlhYTc3ZTg4ZjI3ZmVkNDllNjdhNjQ5MQ==
+    MDNlODNhMzhjYmUzNjFkMTY0MGQ0ZmNjY2E2ZmQxNzFjYTdlOGEzNA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZWE1NDAwYjk4YmIxMmMwMjk0ZDQ0YzliZjExNGZhMjQzZDBhNGMyOWQ0ODQ5
-    NjY2YTkwNDRlZGIwYWRkYzEwOTk0NWNiYzdiYWMyMjI2ZTE3NDQ5YWY5OWUz
-    NTU0N2Q3MTg2OGU3OTdlODU4MDdiMzUyNzYzNDg0ZTMzZjlhMTg=
+    NTZiZDJiYWVkYTBkOGU2YmZjZTU2ZjY5ZTEyZDY2ZGRlZDhmMzNlMDdlNzAz
+    OGIzZjcwNDFlZjkyYjkxZTc5ZGJjMTQ2ZWM0ZWVmOWRiZGQxMzI2MjI2OGU3
+    MzZiMGRiMTc4Y2Q5MTViYjc5MTUzYzRhOTc1NWZlNWQyYjM1ZmQ=
   data.tar.gz: !binary |-
-    MGM4Y2VkMWFkMmYyMzQ0ZmY0MzBmOTQ4MTBhMzVmYmE5MDdjNzhhYzJmNzQy
-    YTAwZDAwOTAwYzY4M2Q3YmM3OWY3ODRiYzBjZTJiZjQzNDFmYjFlZjAxODYw
-    NzU1MTJkZGMyN2ZmNThiZDZiNWJiOTU5ZjkxNDA3MzI1OTI2ZDM=
+    ZDVlYWExY2VlN2NmNTg3NzM1MjdkMWM0ZTYzNzY2MzVjNGQ4MTMwNDdhOWE2
+    OTlkNDNhZTNmNzNhNDQ2NDAyZWQ0MDRjYTE0YjkwMWRmNTk2YWFlYWFlODZm
+    Y2U1OTExZTUwOTc4YTFlOTBjZmY4YTNhNDk2OGEwN2JjNzZjZWM=

data/README.md

@@ -1,3 +1,5 @@
+[![Gem Version](https://badge.fury.io/rb/morph-cli.png)](http://badge.fury.io/rb/morph-cli)
+
 # Morph
 
 TODO: Write a gem description

data/bin/morph

@@ -8,128 +8,49 @@ require "rest_client"
 require 'archive/tar/minitar'
 require 'pathname'
 require 'json'
+require 'morph-cli'
 
 class MorphThor < Thor
-  class_option :dev, default: false, type: :boolean, desc: "Run against a local dev of Morph running at http://localhost:3000"
+  class_option :dev, default: false, type: :boolean, desc: "Run against a local dev of Morph"
 
   desc "[execute]", "execute morph scraper"
   option :directory, :default => Dir.getwd
 
   def execute
-    api_key = retrieve_api_key
-    if api_key.nil?
-      api_key = ask("What is your key? (Go to #{base_url(options)}/settings)")
-      save_api_key(api_key)
+    config = MorphCLI.load_config
+    if options[:dev]
+      env_config = config[:development]
+    else
+      env_config = config[:production]
     end
 
+    config = ask_and_save_api_key(env_config, config) if env_config[:api_key].nil?
+
     api_key_is_valid = false
     until api_key_is_valid
       begin
-        puts "Uploading and running..."
-        file = create_tar(options[:directory], all_paths(options[:directory]))
-        result = RestClient.post("#{base_url(options)}/run", :api_key => api_key, :code => file)
+        MorphCLI.execute(options[:directory], options[:dev], env_config)
         api_key_is_valid = true
       rescue RestClient::Unauthorized
         puts "Your key isn't working. Let's try again."
-        api_key = ask("What is your key? (Go to #{base_url(options)}/settings)")
-        save_api_key(api_key)
-      end
-    end
-    # 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"
+        config = ask_and_save_api_key(env_config, config)
+      rescue Errno::ECONNREFUSED => e
+        $stderr.puts "Morph doesn't look to be running at #{env_config[:base_url]} (#{e})"
+        exit(1)
+      rescue RestClient::InternalServerError => e
+        $stderr.puts "Uh oh. Something has gone wrong on the Morph server at #{env_config[:base_url]} (#{e})"
+        exit(1)        
       end
-      s.puts a["text"]
     end
   end
 
   no_commands {
-    def base_url(options)
-      if options[:dev]
-        "http://127.0.0.1:3000"
-      else
-        "https://morph.io"
-      end
-    end
-
-    def config_path
-      File.join(Dir.home, ".morph")
-    end
-
-    def save_api_key(api_key)
-      configuration = {api_key: api_key}
-      File.open(config_path, "w") {|f| f.write configuration.to_yaml}
-      File.chmod(0600, config_path)
-    end
-
-    def retrieve_api_key
-      if File.exists?(config_path)
-        YAML.load(File.read(config_path))[:api_key]
-      end
-    end
-
-    # TODO Temporary file should be named differently every time
-    def create_dir_tar(directory)
-      in_directory(directory) do
-        tempfile = File.new('/tmp/out', 'wb')
-        Archive::Tar::Minitar.pack('.', tempfile)
-        File.new('/tmp/out', 'r')
-      end
-    end
-
-    def in_directory(directory)
-      cwd = FileUtils.pwd
-      FileUtils.cd(directory)
-      yield
-    ensure
-      FileUtils.cd(cwd)
-    end
-
-    def create_tar(directory, paths)
-      tempfile = File.new('/tmp/out', 'wb')
-
-      in_directory(directory) do
-        begin
-          tar = Archive::Tar::Minitar::Output.new("/tmp/out")
-          paths.each do |entry|
-            Archive::Tar::Minitar.pack_file(entry, tar)
-          end
-        ensure
-          tar.close
-        end
-      end
-      File.new('/tmp/out', 'r')
-    end
-
-    # Relative paths to all the files in the given directory (recursive)
-    # (except for anything below a directory starting with ".")
-    def all_paths(directory)
-      result = []
-      Find.find(directory) do |path|
-        if FileTest.directory?(path)
-          if File.basename(path)[0] == ?.
-            Find.prune
-          end
-        else
-          result << Pathname.new(path).relative_path_from(Pathname.new(directory)).to_s
-        end      
-      end
-      result
-    end
-
-    # Relative path of database file (if it exists)
-    def database_path(directory)
-      path = "data.sqlite"
-      path if File.exists?(File.join(directory, path))
+    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)")
+      MorphCLI.save_config(config)
+      config
     end
   }
-
 end
 
 # If morph is run without any parameters it's the same as "morph execute"

data/lib/morph-cli.rb

@@ -1,5 +1,93 @@
 require "morph-cli/version"
 
 module MorphCLI
-  # Your code goes here...
+  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"
+      end
+      s.puts a["text"]
+    end
+  end
+  
+  def self.config_path
+    File.join(Dir.home, ".morph")
+  end
+
+  def self.save_config(config)
+    File.open(config_path, "w") {|f| f.write config.to_yaml}
+    File.chmod(0600, config_path)
+  end
+
+  DEFAULT_CONFIG = {
+    development: {
+      base_url: "http://127.0.0.1:3000"
+    },
+    production: {
+      base_url: "https://morph.io"
+    }
+  }
+
+  def self.load_config
+    if File.exists?(config_path)
+      YAML.load(File.read(config_path))
+    else
+      DEFAULT_CONFIG
+    end
+  end
+
+  def self.in_directory(directory)
+    cwd = FileUtils.pwd
+    FileUtils.cd(directory)
+    yield
+  ensure
+    FileUtils.cd(cwd)
+  end
+
+  def self.create_tar(directory, paths)
+    tempfile = File.new('/tmp/out', 'wb')
+
+    in_directory(directory) do
+      begin
+        tar = Archive::Tar::Minitar::Output.new("/tmp/out")
+        paths.each do |entry|
+          Archive::Tar::Minitar.pack_file(entry, tar)
+        end
+      ensure
+        tar.close
+      end
+    end
+    File.new('/tmp/out', 'r')
+  end
+
+  # Relative paths to all the files in the given directory (recursive)
+  # (except for anything below a directory starting with ".")
+  def self.all_paths(directory)
+    result = []
+    Find.find(directory) do |path|
+      if FileTest.directory?(path)
+        if File.basename(path)[0] == ?.
+          Find.prune
+        end
+      else
+        result << Pathname.new(path).relative_path_from(Pathname.new(directory)).to_s
+      end      
+    end
+    result
+  end
+
+  # Relative path of database file (if it exists)
+  def self.database_path(directory)
+    path = "data.sqlite"
+    path if File.exists?(File.join(directory, path))
+  end
 end

data/lib/morph-cli/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: morph-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Matthew Landauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-29 00:00:00.000000000 Z
+date: 2014-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -90,7 +90,6 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile