strobe 0.1.2 → 0.1.3

data/lib/strobe/cli/deploy_progress.rb

@@ -0,0 +1,42 @@
+module Strobe
+  class CLI::DeployProgress
+    def initialize
+      @thread  = nil
+      @width   = 50
+      @current = 0
+      @ticker  = CLI::Ticker.new
+    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"
+
+      @ticker.tick "Reticulating splines"
+    end
+
+    def deploy_complete
+      @ticker.stop
+    end
+  end
+end

data/lib/strobe/cli/main.rb

@@ -1,56 +1,5 @@
 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"
         CLI::Users.start( [ "help" ] + args[1..-1] )
@@ -121,6 +70,14 @@ module Strobe
 
       if application_id = config[:application_id]
         resource Application.get! application_id, :lazy => true
+
+        host = resource[:url]
+        host = "staging.#{host}" if options[:staging]
+
+        unless agree "Deploying '#{resource[:name]}' to http://#{host}, continue? [Yn] "
+          say "exiting..."
+          exit
+        end
       else
         resource Account.first.applications.new
       end
@@ -140,7 +97,7 @@ module Strobe
       run_sc_build
 
       host = resource.deploy! :environment => options[:staging] && 'staging',
-                              :callback    => DeployProgress.new
+                              :callback    => CLI::DeployProgress.new
 
       say "The application has successfully been deployed and is available at #{host}"
     end
@@ -217,7 +174,7 @@ module Strobe
         return unless agree "Run `sc-build -c`? [Yn] "
       end
 
-      unless system "sc-build", "-c"
+      unless CLI::Ticker.tick("Running `sc-build -c`", 2) { system "sc-build", "-c" }
         error! "Something went wrong while running `sc-build -c`"
       end
     end

data/lib/strobe/cli/preview.rb

@@ -0,0 +1,42 @@
+require 'rack'
+
+module Strobe
+  module CLI::Preview
+    class Server < Rack::Server
+      def app
+        options[:app]
+      end
+
+      alias wrapped_app app
+    end
+
+    class MagicWrapper
+      def initialize(app)
+        @app = app
+      end
+
+      def call(env)
+        puts "ZOMGZOMG, calling: #{env['PATH_INFO']}"
+        @app.call(env)
+      end
+    end
+
+  private
+
+    def sproutcore_app
+      gem "sproutcore", ">= 1.4.0"
+      require "sproutcore"
+
+      project = SC::Tools.new.requires_project!
+      SC::Rack::Service.new(*project)
+    end
+
+    def wrap(app)
+      MagicWrapper.new(app)
+    end
+
+    def preview_sproutcore_application
+      Server.start :app => wrap(sproutcore_app), :Port => 9292
+    end
+  end
+end

data/lib/strobe/cli/settings.rb

@@ -20,10 +20,10 @@ module Strobe
       @filename = filename
 
       if @filename.exist?
-        @hash = YAML.load(@filename) || {}
-      else
-        @hash = {}
+        @hash = YAML.load_file(@filename)
       end
+
+      @hash = {} unless Hash === @hash
     end
 
     def [](k)

data/lib/strobe/cli/ticker.rb

@@ -0,0 +1,44 @@
+module Strobe
+  class CLI::Ticker
+    def self.tick(msg, interval = 0.5)
+      ticker = new
+      ticker.tick(msg, interval)
+      return ticker unless block_given?
+      yield
+    ensure
+      ticker.stop
+    end
+
+    def initialize
+      @thread
+      @read, @write = IO.pipe
+    end
+
+    def tick(msg, interval = 0.5)
+      @thread = Thread.new do
+        print "#{msg}..."
+
+        while true
+          break if IO.select( [ @read ], nil, nil, interval )
+          print "."
+        end
+
+        @read.read
+        @read.close
+
+        puts
+      end
+
+      true
+    end
+
+    def stop
+      raise "Ticker is not ticking" unless @thread
+
+      @write << '1'
+      @write.close
+      @thread.join
+      true
+    end
+  end
+end

data/lib/strobe/cli.rb

@@ -5,14 +5,18 @@ require 'highline'
 
 module Strobe
   class CLI < Thor
-    autoload :Main,        'strobe/cli/main'
-    autoload :Settings,    'strobe/cli/settings'
-    autoload :Table,       'strobe/cli/table'
-    autoload :Users,       'strobe/cli/users'
+    autoload :DeployProgress, 'strobe/cli/deploy_progress'
+    autoload :Main,           'strobe/cli/main'
+    autoload :Preview,        'strobe/cli/preview'
+    autoload :Settings,       'strobe/cli/settings'
+    autoload :Table,          'strobe/cli/table'
+    autoload :Ticker,         'strobe/cli/ticker'
+    autoload :Users,          'strobe/cli/users'
 
     include Resources
 
     class_option "backtrace", :type => :boolean
+    class_option "yes", :type => :boolean, :aliases => "-y", :banner => "answer yes to all confirmation questions"
 
     def self.start(args)
       $ARGV = args
@@ -112,8 +116,8 @@ module Strobe
       end
     end
 
-    def say(what = nil)
-      puts what
+    def say(*args)
+      puts(*args)
     end
 
     def error(what)
@@ -125,6 +129,7 @@ module Strobe
     end
 
     def agree(msg, *args)
+      return true if options[:yes]
       @highline.agree(msg, *args) do |q|
         next unless STDIN.tty? # For testing
         q.readline = true

data/lib/strobe/resources/signup.rb

@@ -9,18 +9,21 @@ module Strobe
       filter :password_confirmation
 
       validates "user", "account", :presence => true
-      validates "user.password",   :presence => true,
-        :length => { :minimum => 5 }, :with => :password_confirmation
+      validates "user.password",   :with => :validate_password
 
     private
 
-      def password_confirmation
+      def validate_password
         password     = self["user.password"]
         confirmation = self["password_confirmation"]
 
-        unless password == confirmation
-          errors.add "user.password", "and confirmation do not match"
+        msg = case
+        when password.blank?          then "can't be blank"
+        when password.length < 5      then "is too short (minimum is 5 characters)"
+        when password != confirmation then "and confirmation do not match"
         end
+
+        errors.add "user.password", msg if msg
       end
     end
   end

data/lib/strobe/resources.rb

@@ -0,0 +1,13 @@
+module Strobe
+  # Resources
+  module Resources
+    require 'strobe/resources/account'
+    require 'strobe/resources/application'
+    require 'strobe/resources/assignment'
+    require 'strobe/resources/me'
+    require 'strobe/resources/membership'
+    require 'strobe/resources/signup'
+    require 'strobe/resources/team'
+    require 'strobe/resources/user'
+  end
+end

data/lib/strobe.rb

@@ -14,6 +14,7 @@ module Strobe
   autoload :Connection,  'strobe/connection'
   autoload :IdentityMap, 'strobe/identity_map'
   autoload :Key,         'strobe/key'
+  autoload :Resources,   'strobe/resources'
   autoload :Validations, 'strobe/validations'
 
   module Resource
@@ -22,17 +23,6 @@ module Strobe
     autoload :Singleton,  'strobe/resource/singleton'
   end
 
-  # Resources
-  module Resources
-    autoload :Account,     'strobe/resources/account'
-    autoload :Application, 'strobe/resources/application'
-    autoload :Assignment,  'strobe/resources/assignment'
-    autoload :Me,          'strobe/resources/me'
-    autoload :Membership,  'strobe/resources/membership'
-    autoload :Signup,      'strobe/resources/signup'
-    autoload :Team,        'strobe/resources/team'
-    autoload :User,        'strobe/resources/user'
-  end
 
   # Errors
   class StrobeError           < StandardError ; end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Yehuda Katz
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-04 00:00:00 -08:00
+date: 2011-01-05 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -49,7 +49,7 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: thor
+  name: mime-types
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -57,14 +57,14 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version 
         segments: 
+        - 1
+        - 16
         - 0
-        - 14
-        - 0
-        version: 0.14.0
+        version: 1.16.0
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: mime-types
+  name: rack
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -73,11 +73,26 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 1
-        - 16
+        - 2
         - 0
-        version: 1.16.0
+        version: 1.2.0
   type: :runtime
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: thor
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 14
+        - 0
+        version: 0.14.0
+  type: :runtime
+  version_requirements: *id005
 description: The client library for deploying applications to Strobe's HTML5 deployment platform
 email: 
 - wycats@strobecorp.com
@@ -90,9 +105,12 @@ extra_rdoc_files: []
 
 files: 
 - lib/strobe/association.rb
+- lib/strobe/cli/deploy_progress.rb
 - lib/strobe/cli/main.rb
+- lib/strobe/cli/preview.rb
 - lib/strobe/cli/settings.rb
 - lib/strobe/cli/table.rb
+- lib/strobe/cli/ticker.rb
 - lib/strobe/cli/users.rb
 - lib/strobe/cli.rb
 - lib/strobe/collection.rb
@@ -110,6 +128,7 @@ files:
 - lib/strobe/resources/signup.rb
 - lib/strobe/resources/team.rb
 - lib/strobe/resources/user.rb
+- lib/strobe/resources.rb
 - lib/strobe/validations.rb
 - lib/strobe.rb
 - bin/strobe