krl 0.1.60 → 0.1.62

data/bin/krl-connect

@@ -4,6 +4,7 @@ require "rubygems"
 require "sinatra/base"
 require "yaml"
 require "kynetx_am_api"
+require "launchy"
 
 #TODO: add launchy gem to make the browser automatically popup.
 #TODO: make it so you can connect without a web page
@@ -58,4 +59,8 @@ class KRLConnect < Sinatra::Base
   end
 end
 
+Thread.new do 
+  sleep 3
+  Launchy::Browser.run("http://localhost:3009")
+end
 KRLConnect.run!

data/lib/check.rb

@@ -15,10 +15,11 @@ module KRL_CMD
       validateresponse = Net::HTTP.post_form(URI.parse(apiurl), apiargs).body.to_s
       jdata = JSON.parse(validateresponse, { :max_nesting => false })
       if jdata["error"]
+        puts "Errors:"
         puts jdata["error"]
       else
         puts "OK"
       end
     end
   end
-end
+end

data/lib/common.rb

@@ -24,7 +24,9 @@ module KRL_COMMON
     begin
       root_dir = Dir.pwd
       raise "Please re-checkout your app or make sure you are in the root directory of an app." unless File.exists?(File.join(root_dir, ".app"))
-      config = YAML::load_file(File.join(root_dir, '.app'))
+      config_file = File.join(root_dir, '.app')
+      raise "Unable to get the app information. You need to recheckout your app." unless File.exists?(config_file)
+      config = YAML::load_file(config_file)
       user = KRL_CMD::User.new
       app = user.find_application(:application_id => config[:ruleset_id], :version => version)
       return app

data/lib/generate.rb

@@ -1,5 +1,10 @@
 require 'fileutils'
 require 'base64'
+require 'net/http'
+require 'uri'
+require 'json'
+require 'launchy'
+
 module KRL_CMD
   class Generate
     def self.go(args)
@@ -20,20 +25,37 @@ module KRL_CMD
       
     end
     
-    def self.gen_extension(type, args)
+    def self.gen_extension(type, args, env='prod')
       puts "Generating Extension (#{type.to_s}) #{args.join(', ')}"
-      ext = app.extension(type, args[0] || "", args[1] || "", args[2] || "" )
-      write_file(ext, "prod")   
+      # ext = app.extension(type, args[0] || "", args[1] || "", args[2] || "" )
+      # write_file(ext, "prod")   
+     
+      opts = {}
+      opts[:extname] = args[0] if args[0]
+      opts[:extauthor] = args[1] if args[1]
+      opts[:extdesc] = args[2] if args[2]
+      opts[:env] = env
+      opts[:format] = 'url'
+
+      ext = app.endpoint(type, opts)
+      write_file(ext, env)      
     end
     
     def self.gen_bookmarklet(args, env="prod")
       puts "Generating Bookmarklet (#{env})"
       bm = ""
-      if args.to_s.empty?
-        bm = app.bookmarklet(env)
+      opts = {}
+      opts[:env] = env
+      opts[:runtime] = args.to_s unless args.to_s.empty?
+
+      endpoint = app.endpoint(:bookmarklet, opts)
+      
+      if endpoint["errors"].empty?
+        bm = endpoint["data"]
       else
-        bm = app.bookmarklet(env, args.to_s)
+        raise "Invalid bookmark generated. \n#{endpoint.errors.join("\n")}"
       end
+      
       bm_file = File.join(get_endpoint_dir(env), env + "_bookmarklet.html")
       File.open(bm_file, 'w') do |f|
         f.print("<textarea rows='5' cols='100'>#{bm}</textarea><br><br>")
@@ -44,12 +66,19 @@ module KRL_CMD
       puts bm
       puts
       puts "Saved bookmarklet to #{bm_file}."
+      Launchy::Browser.run('file://' + bm_file)
     end
     
     def self.gen_infocard(args, env="prod")
       raise "You must specify a name for the card" if args.empty?
       puts "Generating Infocard (#{env})"
-      icard = app.infocard(args[0] || "", args[1] || "", env)
+      opts = {}
+      opts[:extname] = args[0] if args[0]
+      opts[:datasets] = args[1] if args[1]
+      opts[:env] = env
+      opts[:format] = 'url'
+
+      icard = app.endpoint(:info_card, opts)
       write_file(icard, env)
     end
     
@@ -71,13 +100,20 @@ module KRL_CMD
       if ext["errors"].empty?
         endpoint_dir = get_endpoint_dir(env)
         ext_file_name = File.join(endpoint_dir, ext["file_name"])
-        File.open(ext_file_name, 'wb') do |f|
-          f.write Base64.decode64(ext["data"])
-        end
+        url = URI.parse(ext["data"])
+
+        # Download the file
+        puts "Downloading endpoint from #{ext["data"]} to #{ext_file_name}"
+        Net::HTTP.start(url.host, url.port) { |http|
+          resp = http.get url.path
+          open(ext_file_name, "wb") do |file|
+            file.write(resp.body)
+          end
+        }
         puts "Endpoint was created: #{ext_file_name}"
       else
         raise ext["errors"].join("\n")
       end
     end
   end
-end
+end

data/lib/help.rb

@@ -51,6 +51,7 @@ module KRL_CMD
       puts "show".ljust(20) +     "Shows a specific version of the app."
       puts " ".ljust(20) +        "Example: krl show 10"
       puts "generate".ljust(20) + "Generates an endpoint and places it in the endpoints directory."
+      puts " ".ljust(20) +        "Name, author, and description are optional and default to the user and app settings."
       puts " ".ljust(20) +        "Example: krl generate firefox"
       puts " ".ljust(20) +        "Available endpoints: "
       puts " ".ljust(20) +        "firefox name author description"

data/lib/user.rb

@@ -10,9 +10,10 @@ module KRL_CMD
       KynetxAmApi::Oauth.accounts_server_url = "https://accounts.kynetx.com"
       KynetxAmApi::Oauth.consumer_key = "1j54YDLUcLW9ERBKalNm"
       KynetxAmApi::Oauth.consumer_secret = "QiWCbvTpCAejoceV3f6dD8ycifEkSumFAW1VSmwC"
+      raise "Unable to authenticate. You need to run krl-connect." unless File.exists? CONFIG_FILE
       config = YAML::load_file(CONFIG_FILE)
       super(opts.merge(config))
     end
 
   end
-end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 60
-  version: 0.1.60
+  - 62
+  version: 0.1.62
 platform: ruby
 authors: 
 - Michael Farmer, Cid Dennis
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-01 00:00:00 -06:00
+date: 2010-06-24 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,8 +27,8 @@ dependencies:
         segments: 
         - 0
         - 1
-        - 26
-        version: 0.1.26
+        - 27
+        version: 0.1.27
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -57,9 +57,23 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: launchy
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 3
+        - 5
+        version: 0.3.5
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -67,7 +81,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id004
+  version_requirements: *id005
 description: "    Build your Kynetx applications with the IDE of your choice! Installing the krl gem will give you \n    command line tools that provides a simple interface that is similar to git or svn.\n"
 email: mjf@kynetx.com
 executables: