strobe 0.1.1 → 0.1.2

data/lib/strobe/cli/main.rb

@@ -1,5 +1,55 @@
 module Strobe
   class CLI::Main < CLI
+    class DeployProgress
+      def initialize
+        @thread  = nil
+        @width   = 50
+        @current = 0
+        @read, @write = IO.pipe
+      end
+
+      def upload_progress(percentage)
+        width = 50
+        left  = ( percentage * width ).round
+
+        return if @current == left
+
+        (@current..left).each do |i|
+          arrow = nil
+          right = width - i
+
+          if i < width
+            right -= 1
+            arrow = ">"
+          end
+
+          print "Uploading [#{ '=' * i }#{ arrow }#{' ' * right}]\r"
+        end
+
+        @current = left
+      end
+
+      def upload_complete
+        upload_progress(1.0)
+        print "\n"
+
+        @thread = Thread.new do
+          print "Reticulating splines..."
+
+          while true
+            break if IO.select( [ @read ], nil, nil, 0.5 )
+            print "."
+          end
+
+          puts
+        end
+      end
+
+      def deploy_complete
+        @write << '1'
+        @thread.join
+      end
+    end
 
     def help(*args)
       if args.first == "users"
@@ -89,51 +139,13 @@ module Strobe
 
       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
+                              :callback    => DeployProgress.new
 
       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`."
       list_applications :empty => empty
@@ -211,7 +223,7 @@ module Strobe
     end
 
     def is_sproutcore?
-      File.exist?("#{path}/tmp/build")
+      File.exist?("#{path}/Buildfile")
     end
 
     def determine_application_root

data/lib/strobe/resources/application.rb

@@ -18,13 +18,16 @@ module Strobe
       def deploy!(opts = {})
         self['path'] = opts[:path] if opts[:path]
         environment  = opts[:environment]
+        callback     = opts[:callback]
 
         validate_for_deploy or return
 
         request do
           qs       = "?environment=#{environment}" if environment
           packfile = build_packfile(opts)
-          connection.put("#{http_uri}/deploy#{qs}", packfile, packfile.headers)
+          response = connection.put("#{http_uri}/deploy#{qs}", packfile, packfile.headers)
+          callback.deploy_complete if callback
+          response
         end
 
         [ environment, self['url'] ].compact.join('.')
@@ -101,6 +104,7 @@ module Strobe
         def initialize(opts)
           @opts  = opts
           @files = []
+          @callback = opts[:callback]
         end
 
         def file(path, content_type, body)
@@ -120,8 +124,10 @@ module Strobe
         def read(*args)
           ret = to_io.read(*args)
 
-          if callback = @opts[:upload_callback]
-            ret ? callback.call(pos.to_f / size.to_f) : callback.call(nil)
+          if @callback && ret
+            @callback.upload_progress(pos.to_f / size.to_f)
+          elsif @callback
+            @callback.upload_complete
           end
 
           ret

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Yehuda Katz