zillabyte-cli 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4a32ba8ba6751023917c2ae24ea830e0dc0b097
-  data.tar.gz: e2b8de1a50cc65ea4209e492e2785d7965bb42c5
+  metadata.gz: a12f45e2993b92f487ad7a0b2b406df605ce7141
+  data.tar.gz: c270ac7db26aa00e9d8b8ccf5d61f27dcb3cf33e
 SHA512:
-  metadata.gz: 098790826fa75356e0505e01d7f349aa3d1aeff0cf649a53c5622e20fb4a05c494c59d5d9f4fd0bdf375a00681ee30e80e240b02a3a11b40c240287908d5a600
-  data.tar.gz: 69dec3f61189444b5d30a592e4a447883bc6765c0be75b88e9cc2dfa81ae556b6c69d46b1e793ff5afa33fcd7647ffb682d2d635041de1230f0a27d5b7e170fb
+  metadata.gz: 522f65cdbe2f6660f752dbbc8cf2a83bbc77385159c0fb8d5d0f3d2f13b9366c12d995db3c8a0323765aea1b94bd9d073f35d95559f4e4bd70e806f9ad372b9c
+  data.tar.gz: b19c7334d35942918fa16034d8da5fb22a1872e9011f360253c8d8b1ed7d3ca501edb6f66a62b3320161c685d39f52ce7d1fd9e836a1198570bf8df52718dca5

data/lib/zillabyte/api/flows.rb

@@ -104,7 +104,7 @@ class Zillabyte::API::Flows < Zillabyte::API::Base
       error hash['error_message']
     else
       if(hash['tar'])
-        session.display "unpacking to #{dir}" if type.nil?
+        session.display "unpacking to #{friendly_dir(dir)}" if type.nil?
         require("base64")
         tar = StringIO.new(Base64.decode64(hash['tar']))
         hash.delete('tar')
@@ -112,7 +112,7 @@ class Zillabyte::API::Flows < Zillabyte::API::Base
       #If you get an uri instead of the tar, then download the file directly from s3
       elsif(hash['uri'])
         require("net/http")
-        session.display "downloading ##{id} to #{dir}" if type.nil?
+        session.display "downloading ##{id} to #{friendly_dir(dir)}" if type.nil?
         uri = URI(hash['uri'])
         try_again = 1
         while(try_again)

data/lib/zillabyte/api.rb

@@ -119,8 +119,7 @@ class Zillabyte::API
         begin
           hash = JSON.parse(error.response.body)
           if hash['error_message']
-            @session.error(hash['error_message'], type)
-
+            @session.error(hash['error_message'].to_s, type)
           end
         rescue JSON::ParserError => e
           # Trickle to generic message below

data/lib/zillabyte/cli/apps.rb

@@ -144,7 +144,7 @@ class Zillabyte::Command::Apps < Zillabyte::Command::Flows
 
     error("Unsupported language #{lang}. Zillabyte currently supports #{languages.join(', ')}.", type) if not languages.include? lang
 
-    display "initializing empty #{lang} app in #{dir}" if type.nil?
+    display "initializing empty #{lang} app in #{friendly_dir(dir)}" if type.nil?
     erb_binding = binding
     require("fileutils")
     FileUtils.mkdir_p dir
@@ -162,9 +162,10 @@ class Zillabyte::Command::Apps < Zillabyte::Command::Flows
     end
     
     # Add the git remote... 
-    add_git_remote(name, remote)
+    # add_git_remote(name, remote)
     
   end
+  alias_command("init", "apps:init")
 
 
   # apps:errors ID

data/lib/zillabyte/cli/components.rb

@@ -43,7 +43,7 @@ class Zillabyte::Command::Components < Zillabyte::Command::Flows
 
     error("Unsupported language #{lang}. Zillabyte currently supports #{languages.join(', ')}.", type) if not languages.include? lang
 
-    display "initializing empty #{lang} component in #{dir}" if type.nil?
+    display "initializing empty #{lang} component in #{friendly_dir(dir)}" if type.nil?
     erb_binding = binding
     require("fileutils")
     FileUtils.mkdir_p dir
@@ -61,7 +61,7 @@ class Zillabyte::Command::Components < Zillabyte::Command::Flows
     end
     
     # Add the git remote... 
-    add_git_remote(name, remote)
+    # add_git_remote(name, remote)
     
   end
 

data/lib/zillabyte/cli/flows.rb

@@ -48,7 +48,7 @@ class Zillabyte::Command::Flows < Zillabyte::Command::Base
       if type == "json"
         display "{}"
       else
-        display "Flow ##{res['id']} pulled to #{dir}"
+        display "Flow ##{res['id']} pulled to #{friendly_dir(dir)}"
       end
     end
     
@@ -145,20 +145,13 @@ class Zillabyte::Command::Flows < Zillabyte::Command::Base
   # 
   # Performs any necessary initialization for the flow.
   # 
-  # --dir DIR                                   # Flow directory
-  # --output_type OUTPUT_TYPE                   # Specify an output type i.e. json #HIDDEN
-  # --mode MODE                                 # Specify development or production mode for dependencies #HIDDEN
+  # --dir DIR                    # Flow directory
+  # --output_type OUTPUT_TYPE    # Specify an output type i.e. json #HIDDEN
+  # --mode MODE                  # Specify development or production mode for dependencies #HIDDEN
   #   
   def prep()
     require("zillabyte/cli/config")
-    mode, bundle_extra = case options[:mode]
-    when nil, "development"
-      [:development, ""]
-    when "production"
-      [:production, "; bundle install --deployment"]
-    else
-      error("Unsupported mode #{options[:mode].inspect()}.  Zillabyte currently supports development and production.")
-    end
+    
     type = options[:output_type]
     dir = options[:dir] || shift_argument
     if dir.nil?
@@ -174,14 +167,16 @@ class Zillabyte::Command::Flows < Zillabyte::Command::Base
 
     case meta["language"]
     when "ruby"
-      # Execute in the bundler context
-      if !File.exists?("#{meta['home_dir']}/vendor")
-        full_script = File.join(dir, meta["script"])
-        cmd = "cd \"#{meta['home_dir']}\"; unset BUNDLE_GEMFILE; unset RUBYOPT; bundle install #{bundle_extra}"
-        exec(cmd)
+      
+      base_cmd = "cd \"#{meta['home_dir']}\"; unset BUNDLE_GEMFILE; unset RUBYOPT;"
+      bundle_install_cmd = case options[:mode]
+      when "mock", /^mock-.+/
+        # Don't run 'bundle install' in test mode => speed things up.  This assumes
+        # all gems are already installed locally!
       else
-        display "vendor directory already exists!"
+        exec(base_cmd + "bundle install")
       end
+      
     when "python"
       vDir = "#{meta['home_dir']}/vEnv"
       lock_file = meta['home_dir']+"/zillabyte_thread_lock_file"
@@ -455,6 +450,7 @@ class Zillabyte::Command::Flows < Zillabyte::Command::Base
   # --output_type OUTPUT_TYPE    # Specify an output type i.e. json #HIDDEN
   # --host HOST                  # #HIDDEN
   # --port PORT                  # #HIDDEN
+  # --unix_socket PATH           # #HIDDEN
   #
   # HIDDEN:
   def live_run
@@ -464,6 +460,7 @@ class Zillabyte::Command::Flows < Zillabyte::Command::Base
 
     host = options[:host]
     port = options[:port]
+    unix_socket = options[:unix_socket]
     
     dir = options[:dir] || shift_argument
     if dir.nil?
@@ -480,6 +477,8 @@ class Zillabyte::Command::Flows < Zillabyte::Command::Base
    
     if(host && port)
       exec(Zillabyte::Helpers.command("--execute_live --name #{name.to_s} --host \"#{host}\" --port #{port}",type, dir))      
+    elsif (unix_socket)
+      exec(Zillabyte::Helpers.command("--execute_live --name #{name.to_s} --unix_socket \"#{unix_socket}\"",type, dir))      
     else 
       exec(Zillabyte::Helpers.command("--execute_live --name #{name.to_s}",type, dir))
     end
@@ -495,6 +494,7 @@ class Zillabyte::Command::Flows < Zillabyte::Command::Base
   # --output_type OUTPUT_TYPE    # Specify an output type i.e. json #HIDDEN
   # --host HOST                  # #HIDDEN
   # --port PORT                  # #HIDDEN
+  # --unix_socket PATH           # #HIDDEN
   #
   def info
     
@@ -509,6 +509,7 @@ class Zillabyte::Command::Flows < Zillabyte::Command::Base
     end
     host = options[:host]
     port = options[:port]
+    unix_socket = options[:unix_socket]
     
     if (host && port)
       
@@ -519,6 +520,14 @@ class Zillabyte::Command::Flows < Zillabyte::Command::Base
       socket.close()
       exit
       
+    elsif unix_socket 
+      
+      flow_info = Zillabyte::Helpers.get_info(dir, options)
+      socket = UNIXSocket.new(unix_socket)
+      socket.write(flow_info.to_json)
+      socket.close()
+      exit
+      
     else
       
       # Otherwise, start our own tcp socket and get the info, print to stdout 

data/lib/zillabyte/cli/templates/apps/ruby/app.rb.erb

@@ -3,14 +3,17 @@
 
 require 'zillabyte' 
 
-Zillabyte.app("<%= name %>")
-  .source("select * from web_pages")
-  .each{ |page|
-    if page['html'].include? "hello world"
-      emit :url => page['url']
-    end
-  }
-  .sink{
-    name "has_hello_world"
-    column "url", :string
-  }
+app = Zillabyte.app("<%= name %>")
+
+stream = app.source("web_pages")
+
+stream.each do |page|
+  if page['html'].include? "hello world"
+    emit :url => page['url']
+  end
+end
+
+stream.sink do
+  name "has_hello_world"
+  column "url", :string
+end

data/lib/zillabyte/helpers.rb

@@ -117,38 +117,39 @@ module Zillabyte
     end
     
     
-    def add_git_remote(name, remote = "zillabyte")
-      
-      remotes = {}
-      require("zillabyte/auth")
-      remotes[remote] = Zillabyte::Auth.git_host
-      
-      if ENV["ZILLABYTE_EXTRA_GIT_REMOTES"]
-        # This is for dev purposes -- auto init various git env endpoints
-        JSON.parse(ENV["ZILLABYTE_EXTRA_GIT_REMOTES"]).each_pair do |remote, host|
-          remotes[remote] = host
-        end
-      end
-      
-      # Maybe initialize a git directory at the app root... 
-      if File.exists?(File.join(Dir.pwd, ".git")) == false && File.exists?(File.join(Dir.pwd, "zillabyte.conf.yaml"))
-        git("init .")
-      end
-      
-      # Install each git remote
-      remotes.each_pair do |remote, host|
-      
-        if git('remote').split("\n").include?(remote)
-          # already exists.. remove it. 
-          git("remote remove #{remote}")
-        end
-
-        git_url = "git@#{host}:#{Zillabyte::Auth.user}/#{name}"
-        create_git_remote(remote, git_url)
-        
-      end
-      
-    end
+    # # Deprecated
+    # def add_git_remote(name, remote = "zillabyte")
+    #
+    #   remotes = {}
+    #   require("zillabyte/auth")
+    #   remotes[remote] = Zillabyte::Auth.git_host
+    #
+    #   if ENV["ZILLABYTE_EXTRA_GIT_REMOTES"]
+    #     # This is for dev purposes -- auto init various git env endpoints
+    #     JSON.parse(ENV["ZILLABYTE_EXTRA_GIT_REMOTES"]).each_pair do |remote, host|
+    #       remotes[remote] = host
+    #     end
+    #   end
+    #
+    #   # Maybe initialize a git directory at the app root...
+    #   if File.exists?(File.join(Dir.pwd, ".git")) == false && File.exists?(File.join(Dir.pwd, "zillabyte.conf.yaml"))
+    #     git("init .")
+    #   end
+    #
+    #   # Install each git remote
+    #   remotes.each_pair do |remote, host|
+    #
+    #     if git('remote').split("\n").include?(remote)
+    #       # already exists.. remove it.
+    #       git("remote remove #{remote}")
+    #     end
+    #
+    #     git_url = "git@#{host}:#{Zillabyte::Auth.user}/#{name}"
+    #     create_git_remote(remote, git_url)
+    #
+    #   end
+    #
+    # end
     
     
     # def get_flow_name(dir = Dir.pwd)
@@ -268,6 +269,9 @@ module Zillabyte
     
     end
     
+    
+    
+    
     def command(arg="--execute_live", type = nil, dir = Dir.pwd, ignore_stderr = false, options = {})
       require("zillabyte/cli/config")
       meta = Zillabyte::CLI::Config.get_config_info(dir, self, options)
@@ -301,7 +305,15 @@ module Zillabyte
       return cmd
 
     end
+    
+    
+    def friendly_dir(dir)
+      require 'pathname'
+      Pathname.new(dir).relative_path_from(Pathname.new(Dir.pwd)).to_s
+    end
  
 
   end
 end
+
+

data/lib/zillabyte-cli/version.rb

@@ -1,5 +1,5 @@
 module Zillabyte
   module CLI
-    VERSION = "0.9.2"
+    VERSION = "0.9.3"
   end
 end

data/zillabyte-cli.gemspec

@@ -30,10 +30,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency "activesupport", "~> 3.2.11"
   spec.add_dependency "multi_json", "~> 1.0"
 
-  spec.add_dependency "bundler", "~> 1.3"
   spec.add_dependency "colorize", "~> 0.6"
   spec.add_dependency "indentation", "~> 0.1"
-  spec.add_dependency "eventmachine"
 
   spec.post_install_message = """
 Getting Started with Zillabyte

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zillabyte-cli
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - zillabyte
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-26 00:00:00.000000000 Z
+date: 2014-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -108,20 +108,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
@@ -150,20 +136,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
-- !ruby/object:Gem::Dependency
-  name: eventmachine
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: The Official Zillabyte CLI Gem
 email:
 - gem@zillabyte.com