zillabyte-cli 0.0.19 → 0.0.20

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZWRkYzExYzZiYjg2OWQwMGYzMTRjMzY3MTcxM2YzM2U1MDhiNGY0Yw==
+    NjAzZDgxMjBiY2M0NDU3ODEyNjEyMmJhZjA4MWQ1MjU2NjE0Zjk2YQ==
   data.tar.gz: !binary |-
-    YzAyZGRiNDEyM2JkMDg3ZWE1MWE3YzEwODhlM2ZkZmUyZjVhOTM5Yg==
+    ZjM2ZjY2NTRiZGU3ZmMwMzI1ZDQ5NjNkOTZmMTEzMzAxMzJmZmZkYw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NzcxM2JhYjc4ZGNhM2RkNmNlMDA4YzhhMjEzZGJkOWI1ZTQwOWJiZjVkNWI0
-    YmZhYzYzYTVlNGUyMDU0NzdhYjExYjJmODQyMThkMTQ5MzcyMzY3YTRmYmFm
-    MjNhODQ4ODAzYWY0M2EwZjU3YzVlNmIyZTkzNzA3NzkxYTdmZmM=
+    ZmJhYzkwZWZiMGNkMGJlNzY1N2NlNzdkMjA0ZTU4NzhmNGM3YTBhZjFkZWMz
+    Nzc0ZmJlOGQ3NjQ3NTM3YzE5NDIwNTYxZGI5ZDI4NWY2NjZiOTRkMTY0ZmYz
+    NGI2YjljM2RjNzc0ZGQ3ZTc5N2Y2YmMxYTZiNTkwNjQ5MWExMWY=
   data.tar.gz: !binary |-
-    OGU4ZDNjYTU2NDQ4OGM0ZjZjZmQ5NWIzZjk3ZTFjYmVjMzE3OWY3NzM0OWY3
-    NTU5YmE2N2IzYmQ4ODdhOTUxNmY0MDA0ZmM5YjBiZjlmYmI2NzM5YmU2ZDE5
-    MzQ0MDljYjExZjUzMGIyNzkxYTIxZDE1NmZmYjgzNDk5YmExMWU=
+    MjIxYjU5Mzg3MTYzYTA5OGNkZTNlOGI5ZTFhMjVjNWY2YjE2ZDg1MmQ0YjRl
+    NWFmZTNhNmJhODY5ODgzOTM4YzhjYTI1ZmMyMTRjMjM5ZWJjNTk5YTcyMDc1
+    Yzk0ZTEzZTNkMzY0M2JhMTI2OTBhNDQ2YzY0Yjg0ZjgyNzEyNWI=

data/lib/zillabyte-cli/version.rb

@@ -1,5 +1,5 @@
 module Zillabyte
   module CLI
-    VERSION = "0.0.19"
+    VERSION = "0.0.20"
   end
 end

data/lib/zillabyte/api/apps.rb

@@ -169,7 +169,11 @@ class Zillabyte::API::Apps < Zillabyte::API::Base
     options[:local_flag] = 1
     hash = Zillabyte::API::Apps.get_rich_meta_info_from_script(dir, session, options)
     if hash.nil?
-      error("unable to extract app meta information", type)
+      session.error("unable to extract app meta information", type) if session
+    end
+
+    if hash["error"]
+      session.error(hash["error_message"], type) if session
     end
 
     # Tar up everything... 
@@ -242,7 +246,7 @@ class Zillabyte::API::Apps < Zillabyte::API::Base
     full_script = File.join(dir, hash['script'])
     command = nil
     
-    info_file = SecureRandom.uuid
+    info_file = "#{dir}/#{SecureRandom.uuid}"
     arg = "--info --file #{info_file}"
     
     case hash["language"]

data/lib/zillabyte/cli/apps.rb

@@ -53,6 +53,7 @@ class Zillabyte::Command::Apps < Zillabyte::Command::Base
   # 
   # --config CONFIG_FILE # use the given config file
   # --type TYPE # specify an output type i.e. json
+  # --directory DIR # app directory
   #
   #Examples:
   #
@@ -197,12 +198,17 @@ class Zillabyte::Command::Apps < Zillabyte::Command::Base
   # apps:prep [DIR]
   #
   # prepares an app for execution
-  #
+  # --directory DIR       # app directory
+  # --type TYPE           # specify an output type i.e. json
   #
   def prep
-    
+   
+    type = options[:type] 
     dir = options[:directory] || shift_argument || Dir.pwd
     meta = Zillabyte::CLI::Config.get_config_info(dir)
+    if meta.nil?
+      error("The specified directory (#{dir}) does not appear to contain a valid Zillabyte configuration file.", type)
+    end
 
     case meta["language"]
     when "ruby"
@@ -451,7 +457,7 @@ class Zillabyte::Command::Apps < Zillabyte::Command::Base
   end
   
 
-  # apps:test
+  # apps:test [DIR]
   #
   # tests a local app with sample data
   # 
@@ -459,11 +465,12 @@ class Zillabyte::Command::Apps < Zillabyte::Command::Base
   # --output OUTPUT_FILE  # writes sink output to a file
   # --wait MAX            # max time to spend on each operation (default 10 seconds)
   # --batches BATCHES     # number of batches to emit (default 1)
+  # --directory DIR       # app directory
   #
   def test
     
     output = options[:output]
-    type = options[:type]
+    otype = options[:type] #type is used below for something else
 
     max_seconds = (options[:wait] || "30").to_i
     batches = (options[:batches] || "1").to_i
@@ -515,7 +522,7 @@ class Zillabyte::Command::Apps < Zillabyte::Command::Base
 
 
     # INIT
-    dir = options[:dir] || Dir.pwd
+    dir = options[:directory] || shift_argument || Dir.pwd
 
     meta = Zillabyte::API::Apps.get_rich_meta_info_from_script(dir, self, {:test => true})
     if meta.nil?
@@ -686,7 +693,7 @@ class Zillabyte::Command::Apps < Zillabyte::Command::Base
       end
       
 
-      cmd = command("--execute_live --name #{name}")
+      cmd = command("--execute_live --name #{name}", otype, dir)
       begin
         
         # Start the operation... 
@@ -931,6 +938,7 @@ class Zillabyte::Command::Apps < Zillabyte::Command::Base
   # 
   # --config CONFIG_FILE # use the given config file
   # --type TYPE # specify an output type i.e. json
+  # --directory DIR # directory of app
   #
   # HIDDEN:
   def live_run
@@ -947,9 +955,9 @@ class Zillabyte::Command::Apps < Zillabyte::Command::Base
     end
    
     if(thread_id == "")
-      exec(command("--execute_live --name #{name.to_s}"))
+      exec(command("--execute_live --name #{name.to_s}", type, dir))
     else 
-      exec(command("--execute_live --name #{name.to_s} --pipe #{thread_id}"))
+      exec(command("--execute_live --name #{name.to_s} --pipe #{thread_id}", type, dir))
     end
   end  
   alias_command "live_run", "apps:live_run"
@@ -961,16 +969,18 @@ class Zillabyte::Command::Apps < Zillabyte::Command::Base
   # 
   # --pretty # Pretty prints the info output
   # --type TYPE # specify an output type i.e. json
-  # 
+  # --directory DIR # Directory of the app
+  #
   def info
-    info_file = SecureRandom.uuid
+    dir = options[:directory] || shift_argument || Dir.pwd
     type = options[:type]
+    info_file = "#{dir}/#{SecureRandom.uuid}"
 
-    cmd = command("--info --file #{info_file}")
+    cmd = command("--info --file #{info_file}", type, dir)
     app_info = Zillabyte::Command::Apps.get_info(cmd, info_file)
 
     if type == "json"
-      puts app.info
+      puts app_info
     else
       if options[:pretty]
         puts JSON.pretty_generate(JSON.parse(app_info))
@@ -1029,10 +1039,8 @@ class Zillabyte::Command::Apps < Zillabyte::Command::Base
   #
   # --type TYPE # specify an output type i.e. json
   #
-  def command(arg="--execute_live", ignore_stderr = false)
+  def command(arg="--execute_live", type = nil, dir = Dir.pwd, ignore_stderr = false)
 
-    dir = options[:directory] || shift_argument || Dir.pwd
-    type = options[:type]
     meta = Zillabyte::CLI::Config.get_config_info(dir, self, options)
     #meta = Zillabyte::API::Functions.get_rich_meta_info_from_script(dir, self)
     error("could not extract meta information. missing zillabyte.conf.yml?", type) if meta.nil?

data/lib/zillabyte/cli/config.rb

@@ -11,7 +11,7 @@ module Zillabyte
       ################################################################################
 
       def self.get_config_info(dir, session = nil, options = {})
-        
+       
         conf_file = nil
         if options[:config_file] and File.exists?(options[:config_file])
           conf_file = options[:config_file]   
@@ -19,7 +19,7 @@ module Zillabyte
           conf_file = File.join(dir, options[:config_file] || DEFAULT_CONFIG_FILE)
         end
         type = options[:type]
-        
+       
         return nil unless File.exists?(conf_file)
         hash = YAML.load_file(conf_file)
         

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zillabyte-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.19
+  version: 0.0.20
 platform: ruby
 authors:
 - zillabyte
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-22 00:00:00.000000000 Z
+date: 2014-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -315,7 +315,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: The Official Zillabyte CLI Gem