strobe 0.1.0.beta.2 → 0.1.0.beta.3

data/lib/strobe/cli/main.rb

@@ -1,6 +1,14 @@
 module Strobe
   class CLI::Main < CLI
 
+    def help(*args)
+      if args.first == "users"
+        CLI::Users.start( [ "help" ] + args[1..-1] )
+      else
+        super
+      end
+    end
+
     action "users", 'manage users' do |*args|
       argv = $ARGV[1..-1]
       argv = [ 'list' ] + argv if args.empty?
@@ -55,7 +63,9 @@ module Strobe
     end
 
     application_path_option
-    method_option :staging, :type => :boolean, :banner => "deploy to a staging environment"
+    method_option "staging",     :type => :boolean, :banner => "deploy to a staging environment"
+    method_option "sc-build",    :type => :boolean, :banner => "run `sc-build -c` before deploying"
+    method_option "no-sc-build", :type => :boolean, :banner => "skip the `sc-build -c` step"
     action "deploy", "deploy your application to Strobe" do
       ensure_computer_is_registered
 
@@ -77,17 +87,56 @@ module Strobe
         end
       end
 
-      host = resource.deploy! :environment => options[:staging] && 'staging'
+      run_sc_build
+
+      if STDOUT.tty?
+        thread = nil
+        read, write = IO.pipe
+
+        upload_callback = lambda do |percentage|
+          if percentage
+            width = 50
+            left  = ( percentage * width ).round
+            right = ( ( 1.0 - percentage ) * width ).round
+
+            if left < width
+              right -= 1
+              arrow = ">"
+            end
+
+            print "Uploading [#{'=' * left}#{arrow}#{' ' * right}]\r"
+          else
+            puts
+            thread = Thread.new do
+              print "Reticulating splines..."
+
+              while true
+                break if IO.select( [read ], nil, nil, 0.5 )
+                print "."
+              end
+
+              puts
+            end
+          end
+        end
+      else
+        upload_callback = nil
+      end
+
+      host = resource.deploy! :environment => options[:staging] && 'staging',
+                              :upload_callback => upload_callback
+
+      if STDOUT.tty?
+        write << '1'
+        thread.join
+      end
+
       say "The application has successfully been deployed and is available at #{host}"
     end
 
     action "applications", "list all of your applications" do
       empty = "You do not have any applications. Try deploying one with `strobe deploy`."
-      table Resources::Application.all, :empty => empty do |t|
-        t.column :id
-        t.column :name
-        t.column :url
-      end
+      list_applications :empty => empty
     end
 
     method_option "url",  :type => :string
@@ -119,7 +168,7 @@ module Strobe
     end
 
     application_path_option
-    method_option "id", :type => :numeric, :banner => "The ID of the remote application"
+    method_option "application-id", :type => :numeric, :banner => "The ID of the remote application"
     action "register", "registers a local application with an existing Strobe application" do
       if config[:application_id] && app = Application.get(config[:application_id])
         say "The directory is already registered with the application `#{app[:name]}`"
@@ -129,21 +178,81 @@ module Strobe
         config.delete
       end
 
-      application = Application.get! options[:id]
+      application = options['application-id'] ? Application.get!(options['application-id']) : pick_application
+
       config[:application_id] = application[:id]
+
       say "You can now deploy to #{application[:name]} (http://#{application[:url]})"
     end
 
   private
 
+    def run_sc_build
+      return unless is_sproutcore? # Bail if this isn't a SC application
+
+      # Using both options at the same time makes no sense
+      if options["sc-build"] && options["no-sc-build"]
+        error! "--sc-build and --no-sc-build cannot be used at the same time"
+      end
+
+      # If the user explicitly says that they don't want to run sc-build,
+      # then just skip it
+      return if options["no-sc-build"]
+
+      # If the user doesn't ask either way, confirm first
+      unless options["sc-build"]
+        say "This appears to be a SproutCore application."
+        return unless agree "Run `sc-build -c`? [Yn] "
+      end
+
+      unless system "sc-build", "-c"
+        error! "Something went wrong while running `sc-build -c`"
+      end
+    end
+
+    def is_sproutcore?
+      File.exist?("#{path}/tmp/build")
+    end
+
     def determine_application_root
-      if File.exist?("#{path}/tmp/build")
+      if is_sproutcore?
         return "#{path}/tmp/build"
       end
 
       path
     end
 
+    def list_applications(*args)
+      options      = Hash === args.last ? args.pop : {}
+      applications = args.first || Resources::Application.all
+
+      table applications, options do |t|
+        t.column :id
+        t.column :name
+        t.column :url
+      end
+    end
+
+    def pick_application
+      applications = Resources::Application.all
+
+      if applications.empty?
+        error! "You currently do not have any applications. Create some with `strobe deploy`"
+      end
+
+      list_applications applications, :index => true
+
+      while true
+        index = ask "Pick an application: ", :direct => true
+
+        if index.to_i > 0 and application = applications[index.to_i - 1]
+          return application
+        end
+
+        say "Invalid entry. Please enter one of the numbers in brackets"
+      end
+    end
+
     def ensure_computer_is_registered
       unless settings[:token]
         say "This computer is not yet registered with a Strobe account."

data/lib/strobe/cli/table.rb

@@ -1,10 +1,16 @@
 module Strobe
   class CLI::Table
+    class Index ; end
+
     def initialize(collection, opts = {})
       @collection = collection
       @columns    = []
       @computed   = []
       @opts       = opts
+
+      if opts[:index]
+        @columns.unshift({ :key => Index, :max => 0 })
+      end
     end
 
     def column(key)
@@ -14,7 +20,8 @@ module Strobe
     def to_s
       @collection.each do |obj|
         @computed << @columns.map do |col|
-          cell      = obj[ col[:key] ].to_s
+          cell = obj [ col[:key] ] unless col[:key] == Index
+          cell = cell.to_s
           col[:max] = [ cell.length, col[:max] ].max
           cell
         end
@@ -27,14 +34,15 @@ module Strobe
       str = ""
 
       @columns.each do |col|
-        str << cell_to_s(col, col[:key].to_s.upcase)
+        cell = col[:key].to_s.upcase unless col[:key] == Index
+        str << cell_to_s(col, cell)
       end
 
       str << "\n"
 
-      @computed.each do |cells|
-        cells.each_with_index do |cell, i|
-          str << cell_to_s(@columns[i], cell)
+      @computed.each_with_index do |cells, i|
+        cells.each_with_index do |cell, j|
+          str << cell_to_s(@columns[j], cell, i)
         end
         str << "\n"
       end
@@ -43,9 +51,13 @@ module Strobe
 
   private
 
-    def cell_to_s(col, cell)
+    def cell_to_s(col, cell, index = nil)
+      if index && col[:key] == Index
+        cell = "[#{index + 1}]"
+      end
+
       width = [ col[:max], 25 ].max + 5
-      cell.ljust(width)
+      cell.to_s.ljust(width)
     end
   end
 end

data/lib/strobe/cli.rb

@@ -27,7 +27,8 @@ module Strobe
     def self.action(name, *args, &blk)
       @haxliases ||= []
       @haxliases << name.to_s
-      desc name, *args
+      usage = self == Users ? "users #{name}" : name
+      desc usage, *args
       define_method("__hax__#{name}", &blk)
       map name => "__hax__#{name}"
     end
@@ -119,6 +120,10 @@ module Strobe
       STDERR.puts "[ERROR] #{what}"
     end
 
+    def error!(what)
+      abort what
+    end
+
     def agree(msg, *args)
       @highline.agree(msg, *args) do |q|
         next unless STDIN.tty? # For testing
@@ -160,6 +165,8 @@ module Strobe
     end
 
     def input(key, options)
+      return yield key if options[:direct]
+
       into = options[:into] || key
 
       validation_group into do

data/lib/strobe/collection.rb

@@ -27,6 +27,10 @@ module Strobe
       to_a.each { |r| yield r }
     end
 
+    def empty?
+      to_a.empty?
+    end
+
     def all
       self
     end

data/lib/strobe/connection.rb

@@ -108,20 +108,18 @@ module Strobe
 
         if headers['content-type'] == 'application/json'
           body = ActiveSupport::JSON.encode(body)
-        else
-          body = body.to_s
         end
       end
 
+      http    = build_http
+      request = Net::HTTPGenericRequest.new(
+        method.to_s.upcase, !!body, true, path, headers)
+
       if body.respond_to?(:read)
         request.body_stream = body
         body = nil
       end
 
-      http    = build_http
-      request = Net::HTTPGenericRequest.new(
-        method.to_s.upcase, !!body, true, path, headers)
-
       Response.new(http.request(request, body))
     end
 

data/lib/strobe/resources/application.rb

@@ -1,3 +1,4 @@
+require 'zlib'
 require 'digest/sha1'
 require 'mime/types'
 
@@ -22,8 +23,8 @@ module Strobe
 
         request do
           qs       = "?environment=#{environment}" if environment
-          packfile = build_packfile
-          connection.put("#{http_uri}/deploy#{qs}", packfile.to_s, packfile.headers)
+          packfile = build_packfile(opts)
+          connection.put("#{http_uri}/deploy#{qs}", packfile, packfile.headers)
         end
 
         [ environment, self['url'] ].compact.join('.')
@@ -46,9 +47,9 @@ module Strobe
         end
       end
 
-      def build_packfile
+      def build_packfile(opts)
         Dir.chdir self[:path] do
-          PackFile.build do |m|
+          PackFile.build(opts) do |m|
             Dir["**/*"].each do |filename|
               next unless File.file?(filename)
 
@@ -91,13 +92,14 @@ module Strobe
       end
 
       class PackFile
-        def self.build
-          inst = new
+        def self.build(opts)
+          inst = new(opts)
           yield inst
           inst
         end
 
-        def initialize
+        def initialize(opts)
+          @opts  = opts
           @files = []
         end
 
@@ -106,20 +108,66 @@ module Strobe
         end
 
         def headers
-          { 'Content-Type' => 'application/x-strobe-deploy' }
+          { 'Content-Type'     => 'application/x-strobe-deploy',
+            'Content-Length'   => size.to_s,
+            'Content-Encoding' => 'deflate' }
         end
 
-        def to_s
-          head = ""
-          body = ""
+        def each(*args, &blk)
+          to_io.each(*args, &blk)
+        end
+
+        def read(*args)
+          ret = to_io.read(*args)
 
-          @files.each do |path, type, data|
-            size = data.respond_to?(:bytesize) ? data.bytesize : data.size
-            head << "#{Digest::SHA1.hexdigest(data)} #{size} #{path} #{type}\n"
-            body << data
+          if callback = @opts[:upload_callback]
+            ret ? callback.call(pos.to_f / size.to_f) : callback.call(nil)
           end
 
-          "#{head}\n#{body}"
+          ret
+        end
+
+        def rewind
+          to_io.rewind
+        end
+
+        def seek(*args)
+          to_io.seek(*args)
+        end
+
+        def pos
+          to_io.pos
+        end
+
+        def size
+          to_io.size
+        end
+
+        def eof
+          to_io.eof
+        end
+
+        alias eof? eof
+
+        def to_io
+          @to_io ||= StringIO.new(to_s)
+        end
+
+      private
+
+        def to_s
+          @to_s ||= begin
+            head = ""
+            body = ""
+
+            @files.each do |path, type, data|
+              size = data.respond_to?(:bytesize) ? data.bytesize : data.size
+              head << "#{Digest::SHA1.hexdigest(data)} #{size} #{path} #{type}\n"
+              body << data
+            end
+
+            Zlib::Deflate.deflate("#{head}\n#{body}", 9)
+          end
         end
       end
     end

metadata

@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
   - 1
   - 0
   - beta
-  - 2
-  version: 0.1.0.beta.2
+  - 3
+  version: 0.1.0.beta.3
 platform: ruby
 authors: 
 - Yehuda Katz
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-02 00:00:00 -08:00
+date: 2011-01-03 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency