blockspring-cli 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b8d67e4863e50ee8e4a30a578a48219d235cf45
-  data.tar.gz: 384d2d94c4f5bd9840e23f33a81ccee172f2d843
+  metadata.gz: 2199ec07ab37e2240a7a71926da6987f3c79d919
+  data.tar.gz: 3995e24e9d19f65b51a496256bb822e825ff6201
 SHA512:
-  metadata.gz: b8710bcadab9fc2f74c045bbbf8e955e83957990f3d972999810d89a7369c9b1ea489f43eb1983a93a35c4d604c60c194d308b8794b8943c6548e51b31518977
-  data.tar.gz: 563e030d5c09d30f01e8b9878045fb38fcb05f21171db4df071df5d741ddab5b13386de78b6662322dcb22c8d53f541ba3a8d420e428d097820493f536d12f80
+  metadata.gz: b1a4f5467e6967052800e08ea77bdc7ccfdf992efdd185cfa42989b16ff26da4374efdbfca22d86119c3fd79f98b09f4d97ca947dca165549ff109130e998351
+  data.tar.gz: 803d0d6c3086a62248dafa2168294d8e03ef1e8d53b135588394f7c605a38373f40b90fdf4a00351efcb933cb40e9a608f72b05a62c9b23ce4e3397655cfda92

data/.editorconfig

@@ -0,0 +1,12 @@
+# EditorConfig is awesome: http://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace = true

data/README.md

@@ -10,23 +10,23 @@ Install via command line:
 
 ## Usage
 
-### Login with your api.blockspring.com account.
+#### Login with your api.blockspring.com account.
 ```bash
 blockspring login
 ```
 
-### Create a new block
+#### Create a new block
 ```bash
 blockspring new js "My new JS block"
 cd my-new-js-block
 ```
 
-### Edit your function
+#### Edit your function
 ```bash
 echo "console.log('hi');" > block.js
 ```
 
-### Push
+#### Push
 ```bash
 blockspring push
 ```

data/blockspring-cli.gemspec

@@ -22,6 +22,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
 
   spec.add_dependency "netrc",        "~> 0.8.0"
-  spec.add_dependency "rest-client",  "= 1.7.2"
-  spec.add_dependency "json", "~> 1.8.1"
+  spec.add_dependency "rest-client",  "> 1.6.0"
+  spec.add_dependency "json",         "~> 1.8.1"
+  spec.add_dependency "launchy",      "~> 2.4.2"
+  spec.add_dependency "blockspring",  "> 0.0.0"
 end

data/lib/blockspring/cli/auth.rb

@@ -5,12 +5,12 @@ class Blockspring::CLI::Auth
     include Blockspring::CLI::Helpers
 
     def host
-      ENV['BLOCKSPRING_API_HOST'] || 'localhost:3000'
+      ENV['BLOCKSPRING_API_HOST'] || 'api.blockspring.com'
     end
 
     # TODO: change to https
     def base_url
-      protocol = ENV['BLOCKSPRING_API_PROTOCOL'] || 'http'
+      protocol = ENV['BLOCKSPRING_API_PROTOCOL'] || 'https'
       "#{protocol}://#{host}"
     end
 
@@ -131,7 +131,7 @@ class Blockspring::CLI::Auth
       end
     end
 
-    def netrc   # :nodoc:
+    def netrc
       @netrc ||= begin
         File.exists?(netrc_path) && Netrc.read(netrc_path)
       rescue => error

data/lib/blockspring/cli/command/block.rb

@@ -1,4 +1,5 @@
 require "blockspring/cli/command/base"
+require "launchy"
 
 # manipulate blocks (get, push, pull, new)
 #
@@ -46,7 +47,7 @@ class Blockspring::CLI::Command::Block < Blockspring::CLI::Command::Base
     # TODO: ensure valid config
     puts "Pulling #{config_json['user']}/#{config_json['id']}"
     block = get_block(config_json['id'])
-    save_block_files(block, '.')
+    save_block_files(block, '.', 'Pulling')
     puts "Done."
   end
 
@@ -63,11 +64,25 @@ class Blockspring::CLI::Command::Block < Blockspring::CLI::Command::Base
   #
   def push
     _user, key = Blockspring::CLI::Auth.get_credentials
+
+    unless File.exists?('blockspring.json')
+      return error('blockspring.json file not found')
+    end
+
     config_text = File.read('blockspring.json')
     config_json = JSON.parse(config_text)
-    # TODO: check for language
+
+    if config_json['language'].nil?
+      return error('You must declare a language in your blockspring.json file.')
+    end
+
     # language could eventually be js:0.10.x or py:3 or ruby:MRI-2.0
     script_file = "block.#{config_json['language'].split(':')[0]}"
+
+    unless File.exists?(script_file)
+      return error("#{script_file} file not found")
+    end
+
     script = File.read(script_file)
 
     payload = {
@@ -75,14 +90,23 @@ class Blockspring::CLI::Command::Block < Blockspring::CLI::Command::Base
       config: config_json
     }
 
+    if @args.include? '--force'
+      payload['force'] = true
+    end
+
     if config_json['id']
       uri = "#{Blockspring::CLI::Auth.base_url}/cli/blocks/#{config_json['id']}"
     else
       uri = "#{Blockspring::CLI::Auth.base_url}/cli/blocks"
     end
-    response = RestClient.post uri, payload.to_json, :content_type => :json, :accept => :json, params: { api_key: key }, user_agent: Blockspring::CLI.user_agent
-    json_response = JSON.parse(response.to_str)
-    save_block_files(json_response, '.')
+
+    begin
+      response = RestClient.post uri, payload.to_json, :content_type => :json, :accept => :json, params: { api_key: key }, user_agent: Blockspring::CLI.user_agent
+      json_response = JSON.parse(response.body)
+      save_block_files(json_response, '.', 'Syncronizing')
+    rescue RestClient::Exception => msg
+      error(msg.inspect)
+    end
   end
 
   # block:new LANGUAGE "Block Name"
@@ -103,25 +127,38 @@ class Blockspring::CLI::Command::Block < Blockspring::CLI::Command::Base
     language = @args[0]
     name = @args[1]
 
-    block = {}
+    begin
 
-    block['code'] = ""
+      block = get_template(language)
 
-    block['config'] = {
-      "user" => user,
-      "title" => name,
-      "description" => '',
-      "parameters" => {},
-      "is_public" => false,
-      "language" => language
-    }
+      block['config']['title'] = name
 
-    dir_name = create_block_directory(block)
-    if dir_name
-      save_block_files(block, dir_name)
+      dir_name = create_block_directory(block)
+      if dir_name
+        save_block_files(block, dir_name, 'Creating')
+      end
+    rescue RestClient::ResourceNotFound => msg
+      error("The language '#{language}' is not supported by Blockspring.")
+    rescue RestClient::Exception => msg
+      error(msg.inspect)
+    end
+  end
+
+  def open
+    config_text = File.read('blockspring.json')
+    config_json = JSON.parse(config_text)
+
+    user = config_json['user']
+    block_id = config_json['id']
+
+    uri = "#{Blockspring::CLI::Auth.base_url}/#{user}/#{block_id}"
+
+    Launchy.open( uri ) do |exception|
+      puts "Attempted to open #{uri} and failed because #{exception}"
     end
   end
 
+  alias_command "open", "block:open"
   alias_command "get",  "block:get"
   alias_command "pull", "block:pull"
   alias_command "push", "block:push"
@@ -136,6 +173,12 @@ protected
     JSON.parse(response.to_str)
   end
 
+  def get_template(format)
+    _user, key = Blockspring::CLI::Auth.get_credentials
+    response = RestClient.get "#{Blockspring::CLI::Auth.base_url}/cli/templates/#{format}", params: { api_key: key }, user_agent: Blockspring::CLI.user_agent
+    JSON.parse(response.to_str)
+  end
+
   def create_block_directory(block)
 
     dir_name = get_block_directory(block)
@@ -160,15 +203,22 @@ protected
     end
   end
 
-  def save_block_files(block, dir_name)
-    # create script file
+  def save_block_script(block, dir_name, action='Syncing')
     script_file = File.join(dir_name, "block.#{block['config']['language'].split(':')[0]}")
-    puts "Syncing script file #{script_file}"
+    puts "#{action} script file #{script_file}"
     File.open(script_file, 'w') { |file| file.write(block['code']) }
+  end
 
-    # create config file
+  def save_block_config(block, dir_name, action='Syncing')
     config_file = File.join(dir_name, "blockspring.json")
-    puts "Syncing config file #{config_file}"
+    puts "#{action} config file #{config_file}"
     File.open(config_file, 'w') { |file| file.write(JSON.pretty_generate(block['config']) + "\n") }
   end
+
+  def save_block_files(block, dir_name, action='Syncing')
+    # create script file
+    save_block_script(block, dir_name, action)
+    # create config file
+    save_block_config(block, dir_name, action)
+  end
 end

data/lib/blockspring/cli/command/run.rb

@@ -54,6 +54,19 @@ class Blockspring::CLI::Command::Run < Blockspring::CLI::Command::Base
   # $ blockspring run:remote jtokoph/aasdfj332flk3 --zip-code=94110
   #
   def remote
-    error('not yet implimented')
+    require 'blockspring'
+
+    _, key = Blockspring::CLI::Auth.get_credentials
+
+    block_id = @args[0]
+
+    myBlock = lambda do |request, response|
+      response = Blockspring.run(block_id, request.params, key)
+
+      # TODO: don't autoparse the json in the library, I want the raw json
+      puts response.to_json
+    end
+
+    Blockspring.define(myBlock)
   end
 end

data/lib/blockspring/cli/version.rb

@@ -1,5 +1,5 @@
 module Blockspring
   module CLI
-    VERSION = "0.0.7"
+    VERSION = "0.0.8"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blockspring-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Blockspring
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-25 00:00:00.000000000 Z
+date: 2014-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -56,16 +56,16 @@ dependencies:
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">"
       - !ruby/object:Gem::Version
-        version: 1.7.2
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">"
       - !ruby/object:Gem::Version
-        version: 1.7.2
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +80,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.1
+- !ruby/object:Gem::Dependency
+  name: launchy
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.4.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.4.2
+- !ruby/object:Gem::Dependency
+  name: blockspring
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: 0.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: 0.0.0
 description: This is the command line helper for blockspring
 email:
 - founders@blockspring.com
@@ -88,6 +116,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".editorconfig"
 - ".gitignore"
 - Gemfile
 - LICENSE.txt