strobe 0.1.4 → 0.1.6

data/CHANGELOG.md

@@ -0,0 +1,41 @@
+## 0.1.6 (March, 23rd, 2011)
+
+Bugfixes:
+
+  - Fix `strobe open` so that it actually opens stuff.
+
+## 0.1.5 - yanked (March, 22nd, 2011)
+
+Features:
+
+  - `strobe open` will open the application that was just deployed
+  - Pass the -r flag to sc-build
+  - The CLI tool will use a default value if none is provided when
+    requesting for input.
+  - You may now specify custom 404 pages by providing a 404.html page
+    at the root of the project.
+  - Add the ability to delete arbitrary applications by passing
+    --application-id=X to `strobe delete`.
+  - `strobe delete` when not in an application root and no application
+    is specified will become interactive.
+  - Speed up `strobe deploy` in certain cases.
+  - `strobe applications` will show the local path to the application if
+    it is known.
+
+Bugfixes:
+
+  - `strobe set` without any options will no longer set the
+    application URL to a random value.
+  - Pressing CTRL-C when the strobe CLI tool is requesting input
+    will now exit.
+  - Fix redirects in the `strobe preview` proxy.
+
+## 0.1.4 (January 11th, 2011)
+
+Features:
+
+  - Deploy applications to Strobe Platform w/ `strobe deploy`
+  - Basic account management
+  - Basic user management
+  - Basic application management
+  - `strobe preview` provides the proxy

data/lib/strobe/cli.rb

@@ -1,7 +1,7 @@
 require 'thor'
 require 'pathname'
 require 'fileutils'
-require 'highline'
+require 'launchy'
 
 module Strobe
   class CLI < Thor
@@ -12,6 +12,7 @@ module Strobe
     autoload :Table,          'strobe/cli/table'
     autoload :Ticker,         'strobe/cli/ticker'
     autoload :Users,          'strobe/cli/users'
+    autoload :Input,          'strobe/cli/input'
 
     include Resources
 
@@ -26,6 +27,8 @@ module Strobe
     rescue Strobe::StrobeError => e
       raise if $ARGV.include?('--backtrace')
       abort "[ERROR] #{e.message}"
+    rescue Interrupt
+      abort  "\nQuitting..."
     end
 
     def self.action(name, *args, &blk)
@@ -57,7 +60,7 @@ module Strobe
       super
 
       @resource = nil
-      @highline = HighLine.new
+      @input = Input.new
 
       # State
       @in_group = false
@@ -72,7 +75,11 @@ module Strobe
       options[:path] || Dir.pwd
     end
 
-    def config
+    def config(app = nil)
+      if app
+        @config = settings.configs.find { |c| c[:application_id] = app[:id] }
+      end
+
       @config ||= Settings.application(path)
     end
 
@@ -130,32 +137,23 @@ module Strobe
 
     def agree(msg, *args)
       return true if options[:yes]
-      @highline.agree(msg, *args) do |q|
-        next unless STDIN.tty? # For testing
-        q.readline = true
-      end
+      @input.agree(msg, *args)
     end
 
     def ask(key, options = {})
       input key, options do |msg|
-        resp = @highline.ask msg do |q|
-          next unless STDIN.tty? # For testing
-          q.readline = true
-        end
+        resp = @input.ask msg
       end
     end
 
     def password(key, options = {})
       input key, options do |msg|
-        @highline.ask msg do |q|
-          next unless STDIN.tty? # For testing
-          q.echo = '*'
-        end
+        @input.ask_for_password msg
       end
     end
 
     def choose
-      @highline.choose do |menu|
+      @input.choose do |menu|
         yield menu
       end
     end

data/lib/strobe/cli/input.rb

@@ -0,0 +1,125 @@
+module Strobe
+  class CLI::Input
+
+    class Menu
+      class NoSuchOptionError < StandardError; end
+
+      attr_reader :choices, :actions, :input
+
+      def initialize(input)
+        @input = input
+        @choices = []
+        @actions = {}
+      end
+
+      def choice(name, &block)
+        choices << name
+        actions[name] = block
+      end
+
+      def display
+        choices.each_with_index do |choice, i|
+          input.puts "#{i+1}. #{choice}"
+        end
+      end
+
+      def ask
+        display
+
+        begin
+          input.print "?  "
+
+          option = input.gets.strip.to_i
+          if option < 1 || option > choices.length
+            input.puts "Please enter a number between 1 and #{choices.length}"
+            raise NoSuchOptionError
+          end
+
+          actions[choices[option - 1]].call
+        rescue NoSuchOptionError
+          retry
+        end
+      end
+    end
+
+    attr_reader :stdin, :stdout
+
+    def initialize(stdin = STDIN, stdout = STDOUT)
+      @stdin, @stdout = stdin, stdout
+    end
+
+    def ask(msg = nil)
+      print msg if msg
+      gets.strip
+    end
+
+    def agree(msg = nil)
+      print msg if msg
+      c = gets.strip.downcase
+      c == "y" || c.strip.blank?
+    end
+
+    def choose(&block)
+      m = Menu.new(self)
+      yield m
+      m.ask
+    end
+
+    def ask_for_password(msg = nil)
+      print msg if msg
+      running_on_windows? ? ask_for_password_on_windows : ask_for_password_on_others
+    end
+
+    def puts(*args)
+      stdout.puts(*args)
+    end
+
+    def print(*args)
+      stdout.print(*args)
+    end
+
+    def gets(*args)
+      stdin.gets(*args)
+    end
+
+    private
+      def running_on_windows?
+        RUBY_PLATFORM =~ /mswin32|mingw32/
+      end
+
+      def echo_off
+        system "stty -echo"
+      end
+
+      def echo_on
+        system "stty echo"
+      end
+
+      def ask_for_password_on_windows
+        require "Win32API"
+        char = nil
+        password = ''
+
+        while char = Win32API.new("crtdll", "_getch", [ ], "L").Call do
+          break if char == 10 || char == 13 # received carriage return or newline
+          if char == 127 || char == 8 # backspace and delete
+            password.slice!(-1, 1)
+          else
+            # windows might throw a -1 at us so make sure to handle RangeError
+            (password << char.chr) rescue RangeError
+          end
+        end
+        puts
+        return password
+      end
+
+      def ask_for_password_on_others
+        echo_off if stdin.tty?
+        password = ask
+        puts if stdin.tty?
+        password
+      ensure
+        echo_on if stdin.tty?
+      end
+  end
+end

data/lib/strobe/cli/main.rb

@@ -16,6 +16,13 @@ module Strobe
       CLI::Users.start(argv)
     end
 
+    action "open", "opens application in browser" do
+      resource get_application
+      url = resource['url']
+
+      Launchy.open("http://#{url}")
+    end
+
     action "signup", "signup for a new Strobe account" do
       resource Signup.new :account => { :name => 'default' }
 
@@ -71,12 +78,18 @@ module Strobe
     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"
+    method_option "url",                            :banner => "set application's url"
     action "deploy", "deploy your application to Strobe" do
       ensure_computer_is_registered
 
       if application_id = config[:application_id]
         resource Application.get! application_id, :lazy => true
 
+        if options[:url]
+          resource[:url] = options[:url]
+          save {}
+        end
+
         host = resource[:url]
         host = "staging.#{host}" if options[:staging]
 
@@ -85,7 +98,7 @@ module Strobe
           exit
         end
       else
-        resource Account.first.applications.new
+        resource Account.first.applications.new(:url => options[:url])
       end
 
       resource[:path] = determine_application_root
@@ -97,13 +110,15 @@ module Strobe
 
         save do
           config[:application_id] ||= resource[:id]
+          settings.register_app_path(config.filename)
         end
       end
 
       run_sc_build
 
       host = resource.deploy! :environment => options[:staging] && 'staging',
-                              :callback    => CLI::DeployProgress.new
+                              :callback    => CLI::DeployProgress.new,
+                              :sproutcore  => is_sproutcore?
 
       say "The application has successfully been deployed and is available at #{host}"
     end
@@ -118,16 +133,23 @@ module Strobe
     application_path_option
     action "set", "update the settings for the application" do
       resource get_application
-      resource['url'] = options['url']
 
-      save do
-        say "The application is now running at #{resource[:url]}"
+      if options['url'].blank?
+        say "[ERROR] You need to specify what to set"
+      else
+        resource['url'] = options['url']
+
+        save do
+          say "The application is now running at #{resource[:url]}"
+        end
       end
     end
 
     application_path_option
+    method_option "application-id", :type => :numeric, :banner => "Delete application with given id"
     action "delete", "delete a specific application" do
-      resource get_application
+      id = options['application-id'] || config[:application_id]
+      resource(id ? Application.get!(id) : pick_application)
 
       say "Deleting application '#{resource[:name]}'"
 
@@ -137,7 +159,7 @@ module Strobe
       end
 
       delete do
-        config.delete
+        config(resource).delete
         say "The application has been deleted"
       end
     end
@@ -156,6 +178,7 @@ module Strobe
       application = options['application-id'] ? Application.get!(options['application-id']) : pick_application
 
       config[:application_id] = application[:id]
+      settings.register_app_path(config.filename)
 
       say "You can now deploy to #{application[:name]} (http://#{application[:url]})"
     end
@@ -174,14 +197,17 @@ module Strobe
       # then just skip it
       return if options["no-sc-build"]
 
+      apps = Dir['apps/*'].map{|d| d.split('/')[1] }
+      cmd = "sc-build -cr #{apps.join(' ')}".strip
+
       # 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] "
+        return unless agree "Run `#{cmd}`? [Yn] "
       end
 
-      unless CLI::Ticker.tick("Running `sc-build -c`", 2) { system "sc-build", "-c" }
-        error! "Something went wrong while running `sc-build -c`"
+      unless CLI::Ticker.tick("Running `#{cmd}`", 2) { system cmd }
+        error! "Something went wrong while running `#{cmd}`"
       end
     end
 
@@ -205,6 +231,12 @@ module Strobe
         t.column :id
         t.column :name
         t.column :url
+        t.column :path do |app|
+          config = settings.configs.find do |c|
+            c[:application_id] == app[:id]
+          end
+          config.application_path if config
+        end
       end
     end
 
@@ -240,7 +272,7 @@ module Strobe
     end
 
     def get_application(opts = {})
-      unless id = config[:application_id]
+      unless id = opts.delete(:application_id) || config[:application_id]
         error "No application found. Are you currently in the correct directory?"
         exit 1
       end

data/lib/strobe/cli/settings.rb

@@ -16,8 +16,10 @@ module Strobe
       new application_config_file(root)
     end
 
+    attr_reader :filename
+
     def initialize(filename = self.class.global_config_file)
-      @filename = filename
+      @filename = Pathname.new(filename)
 
       if @filename.exist?
         @hash = YAML.load_file(@filename)
@@ -26,26 +28,24 @@ module Strobe
       @hash = {} unless Hash === @hash
     end
 
+    def application_path
+      filename.sub %r[/.strobe/config(\.[a-z]+)?$]i, ''
+    end
+
     def [](k)
       ENV[key(k)] || @hash[key(k)]
     end
 
     def []=(k, val)
       @hash[key(k)] = val
-
-      # Persist the setting
-      FileUtils.mkdir_p(@filename.dirname)
-      File.open(@filename, "wb") do |file|
-        file.puts @hash.to_yaml
-      end
-
+      persist!
       val
     end
 
     def connection
       return @connection if @connection
-      host = self[:url] || "http://api.strobeapp.com/"
-      @connection = Connection.new(host)
+      url = self[:url] || "http://api.strobeapp.com/"
+      @connection = Connection.new(url, 'host' => self[:host])
     end
 
     def connect!
@@ -63,10 +63,48 @@ module Strobe
       FileUtils.rm_f(@filename)
     end
 
+    def configs
+      @configs ||= begin
+        self[:applications] ||= []
+        self[:applications].map do |path|
+          next unless File.file?(path)
+          self.class.new(path)
+        end.compact
+      end
+    end
+
+    def register_app_path(path)
+      self[:applications] ||= []
+      self[:applications] |= [File.expand_path(path.to_s)]
+      self[:applications]  = self[:applications].select do |path|
+        File.file?(path)
+      end
+
+      persist!
+    end
+
+    def unregister_app_path(path)
+      self[:applications] ||= []
+      self[:applications].delete File.expand_path(path.to_s)
+      self[:applications] = self[:applications].select do |path|
+        File.file?(path)
+      end
+
+      persist!
+    end
+
   private
 
     def key(key)
       "STROBE_#{key}".upcase
     end
+
+    def persist!
+      # Persist the setting
+      FileUtils.mkdir_p(@filename.dirname)
+      File.open(@filename, "wb") do |file|
+        file.puts @hash.to_yaml
+      end
+    end
   end
 end

data/lib/strobe/cli/table.rb

@@ -13,14 +13,19 @@ module Strobe
       end
     end
 
-    def column(key)
-      @columns << { :key => key, :max => 0 }
+    def column(key, opts = {}, &blk)
+      @columns << { :key => key, :max => 0, :blk => blk }.merge(opts)
     end
 
     def to_s
       @collection.each do |obj|
         @computed << @columns.map do |col|
-          cell = obj [ col[:key] ] unless col[:key] == Index
+          if col[:blk]
+            cell = col[:blk].call(obj)
+          elsif col[:key] != Index
+            cell = obj[ col[:key] ]
+          end
+
           cell = cell.to_s
           col[:max] = [ cell.length, col[:max] ].max
           cell
@@ -34,7 +39,7 @@ module Strobe
       str = ""
 
       @columns.each do |col|
-        cell = col[:key].to_s.upcase unless col[:key] == Index
+        cell = (col[:header] || col[:key]).to_s.upcase unless col[:key] == Index
         str << cell_to_s(col, cell)
       end
 

data/lib/strobe/collection.rb

@@ -8,13 +8,17 @@ module Strobe
       @klass, @params = klass, params
     end
 
+    def where(params)
+      Strobe::Collection.new(klass, params)
+    end
+
     def to_a
       @to_a ||= begin
         resp = Strobe.connection.get klass.resource_uri, params
         resp.validate!
 
         if resp.status == 200
-          resp.body[klass.resource_name].map do |hash|
+          resp.body[klass.pluralized_root].map do |hash|
             klass.new(hash)
           end
         else

data/lib/strobe/connection.rb

@@ -3,12 +3,19 @@ require 'net/http'
 
 module Strobe
   class Connection
-    attr_reader :url
+    def self.host_and_port(uri)
+      uri = "http://#{uri}" unless uri =~ %r[^https?://]
+      uri = URI(uri)
+      [ uri.host, uri.port ]
+    end
+
+    attr_reader :host, :port
 
-    def initialize(url)
-      @url      = URI(url)
-      @user     = nil
-      @password = nil
+    def initialize(url, headers = {})
+      @host, @port = self.class.host_and_port(url)
+      @headers     = headers
+      @user        = nil
+      @password    = nil
     end
 
     def authenticate_with_token(token)
@@ -98,7 +105,13 @@ module Strobe
 
     def request(method, path, body = nil, headers = {})
       headers.keys.each do |key|
-        headers[key.downcase] = headers.delete(key)
+        headers[key.to_s.downcase] = headers.delete(key)
+      end
+
+      # add connection-global headers, which will be
+      # overwritten by request-specific headers
+      @headers.each do |k, v|
+        headers[k.to_s.downcase] ||= v if v
       end
 
       headers['authorization'] ||= authorization_header
@@ -126,7 +139,7 @@ module Strobe
   private
 
     def build_http
-      http = Net::HTTP.new @url.host, @url.port || 80
+      http = Net::HTTP.new host, port || 80
       http.read_timeout = 60
       http.open_timeout = 10
       http
@@ -142,22 +155,5 @@ module Strobe
     def authorize?
       @user
     end
-
-    def json_connection
-      @json_connection ||= Faraday::Connection.new(:url => @url) do |b|
-        b.use Faraday::Request::ActiveSupportJson
-        b.use Faraday::Adapter::NetHttp
-        b.use Faraday::Response::ActiveSupportJson
-        b.headers['authorization'] = authorization_header if authorize?
-      end
-    end
-
-    def reg_connection
-      @reg_connection ||= Faraday::Connection.new(:url => @url) do |b|
-        b.use Faraday::Adapter::NetHttp
-        b.use Faraday::Response::ActiveSupportJson
-        b.headers['authorization'] = authorization_header if authorize?
-      end
-    end
   end
 end

data/lib/strobe/middleware/proxy.rb

@@ -7,8 +7,9 @@ module Strobe
     # A wrapper around the Net/HTTP response body
     # that allows rack to stream the result down
     class Body
-      def initialize(queue)
+      def initialize(queue, options = {})
         @queue = queue
+        @options = options
       end
 
       def each
@@ -16,9 +17,24 @@ module Strobe
           if Exception === chunk
             raise chunk
           else
-            yield chunk
+            yield prepare_chunk(chunk)
           end
         end
+
+        yield "0\r\n\r\n" if chunked?
+      end
+
+      def prepare_chunk(chunk)
+        if chunked?
+          size = chunk.respond_to?(:bytesize) ? chunk.bytesize : chunk.length
+          "#{size.to_s(16)}\r\n#{chunk}\r\n"
+        else
+          chunk
+        end
+      end
+
+      def chunked?
+        @options[:chunked]
       end
     end
 
@@ -26,18 +42,34 @@ module Strobe
       @app = app
     end
 
+    def redirect?(status)
+      status >= 300 && status < 400
+    end
+
     def call(env)
       if env['PATH_INFO'] =~ proxy_path
         host, port = $1.split(':')
+        path = $2 || '/'
+
+        running = true
+        while running
+          queue = run_request(env, host, ( port || 80 ).to_i, path)
 
-        queue = run_request(env, host, ( port || 80 ).to_i, $2 || '/')
+          msg = queue.pop
+          status = msg[0].to_i
 
-        msg = queue.pop
+          if redirect?(status) && location = msg[1]['location']
+            uri = URI.parse(location)
+            host, port, path = uri.host, uri.port, uri.path
+          else
+            running = false
+          end
+        end
 
         if Exception === msg
           raise msg
         else
-          [ msg[0], msg[1], Body.new(queue) ]
+          [ msg[0], msg[1], Body.new(queue, :chunked => chunked?(msg[1])) ]
         end
       else
         @app.call(env)
@@ -46,11 +78,15 @@ module Strobe
 
   private
 
+    def chunked?(headers)
+      headers["transfer-encoding"] == "chunked"
+    end
+
     def proxy_path
       %r[/_strobe/proxy/([^/]+)(/.*)?$]
     end
 
-    KEEP = [ 'CONTENT_LENGTH', 'CONTENT_TYPE' ]
+    KEEP = [ 'CONTENT_LENGTH', 'CONTENT_TYPE', 'Connection' ]
 
     def run_request(env, host, port, path)
       queue = Queue.new
@@ -59,6 +95,8 @@ module Strobe
         body = env['rack.input']
       end
 
+      env["Connection"] = "keep-alive"
+
       unless env['QUERY_STRING'].blank?
         path += "?#{env['QUERY_STRING']}"
       end

data/lib/strobe/resource/base.rb

@@ -65,6 +65,12 @@ module Strobe
         def uri_prefix
           @uri_prefix ||= "/#{resource_name}"
         end
+
+        def root(root = nil)
+          @root ||= singular_resource_name
+          @root = root if root
+          @root
+        end
       end
 
       attr_reader :response
@@ -112,6 +118,7 @@ module Strobe
           inst[parts[1..-1]]
         else
           parts.inject(params) do |param, key|
+            return unless param
             param[key]
           end
         end
@@ -178,7 +185,7 @@ module Strobe
 
       def request
         @response = yield
-        root      = self.class.singular_resource_name
+        root      = self.class.root
 
         @response.validate!
 
@@ -209,7 +216,7 @@ module Strobe
 
       def request_params
         filter = self.class.filter
-        { self.class.singular_resource_name => params.except(*filter) }
+        { self.class.root => params.except(*filter) }
       end
 
       def create

data/lib/strobe/resource/collection.rb

@@ -27,6 +27,10 @@ module Strobe
           singular_resource_name.pluralize
         end
 
+        def pluralized_root
+          root.pluralize
+        end
+
         def resource_uri
           uri_prefix
         end
@@ -37,6 +41,10 @@ module Strobe
 
         alias all collection
 
+        def where(params)
+          Strobe::Collection.new(self, params)
+        end
+
         def new(params = {})
           inst = IdentityMap.identify(self, key.key_for(params)) do
             super({})
@@ -91,7 +99,7 @@ module Strobe
         resp.validate! if opts[:validate]
 
         if resp.success?
-          self.params = resp.body[self.class.singular_resource_name]
+          self.params = resp.body[self.class.root]
           self
         end
       end

data/lib/strobe/resources/application.rb

@@ -1,6 +1,5 @@
 require 'zlib'
 require 'digest/sha1'
-require 'mime/types'
 
 module Strobe
   module Resources
@@ -55,36 +54,34 @@ module Strobe
           PackFile.build(opts) do |m|
             Dir["**/*"].each do |filename|
               next unless File.file?(filename)
-
-              mime_type = MIME::Types.type_for(filename).first
-              mime_type ||= "application/octet-stream"
-
-              m.file filename, mime_type.to_s, read(filename)
+              m.file filename, read(filename)
             end
 
             picked_root_app = false
 
-            Dir["static/*"].each do |appdir|
-              next if File.file?(appdir)
+            if opts[:sproutcore]
+              Dir["static/*"].each do |appdir|
+                next if File.file?(appdir)
 
-              app_name = File.basename(appdir)
-              index    = Dir["#{appdir}/*/*/index.html"].first
+                app_name = File.basename(appdir)
+                index    = Dir["#{appdir}/*/*/index.html"].first
 
-              next unless index && File.file?(index)
+                next unless index && File.file?(index)
 
-              manifest = "#{File.dirname(index)}/app.manifest"
-              manifest = read(manifest) if File.file?(manifest)
-              content  = read(index)
+                manifest = "#{File.dirname(index)}/app.manifest"
+                manifest = read(manifest) if File.file?(manifest)
+                content  = read(index)
 
-              m.file "#{app_name}/index.html",   "text/html",           content
-              m.file "#{app_name}/app.manifest", "text/cache-manifest", manifest if manifest
+                m.file "#{app_name}/index.html",   content
+                m.file "#{app_name}/app.manifest", manifest if manifest
 
-              next if picked_root_app
+                next if picked_root_app
 
-              m.file "index.html",   "text/html",           content
-              m.file "app.manifest", "text/cache-manifest", manifest
+                m.file "index.html",   content
+                m.file "app.manifest", manifest
 
-              picked_root_app = true
+                picked_root_app = true
+              end
             end
           end
         end
@@ -107,14 +104,17 @@ module Strobe
           @callback = opts[:callback]
         end
 
-        def file(path, content_type, body)
-          @files << [path, content_type, body]
+        def file(path, body)
+          @files << [path, body]
         end
 
         def headers
-          { 'Content-Type'     => 'application/x-strobe-deploy',
+          {
+            'Content-Type'     => 'application/x-strobe-deploy',
             'Content-Length'   => size.to_s,
-            'Content-Encoding' => 'deflate' }
+            'Content-Encoding' => 'deflate',
+            'X-Strobe-Deploy-Protocol-Version' => '2'
+          }
         end
 
         def each(*args, &blk)
@@ -166,9 +166,9 @@ module Strobe
             head = ""
             body = ""
 
-            @files.each do |path, type, data|
+            @files.each do |path, data|
               size = data.respond_to?(:bytesize) ? data.bytesize : data.size
-              head << "#{Digest::SHA1.hexdigest(data)} #{size} #{path} #{type}\n"
+              head << "#{Digest::SHA1.hexdigest("blob #{size}\0#{data}")}\0#{size}\0#{path}\n"
               body << data
             end
 

metadata

@@ -1,21 +1,16 @@
 --- !ruby/object:Gem::Specification 
 name: strobe
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 4
-  version: 0.1.4
+  prerelease: 
+  version: 0.1.6
 platform: ruby
 authors: 
-- Yehuda Katz
 - Carl Lerche
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-01-11 00:00:00 -08:00
+date: 2011-03-23 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,76 +21,55 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 0
         version: 3.0.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: highline
+  name: mime-types
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 6
-        - 0
-        version: 1.6.0
+        version: 1.16.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: mime-types
+  name: rack
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 16
-        - 0
-        version: 1.16.0
+        version: 1.2.0
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rack
+  name: thor
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 2
-        - 0
-        version: 1.2.0
+        version: 0.14.0
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: thor
+  name: launchy
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 14
-        - 0
-        version: 0.14.0
+        version: "0"
   type: :runtime
   version_requirements: *id005
 description: The client library for deploying applications to Strobe's HTML5 deployment platform
 email: 
-- wycats@strobecorp.com
 - carl@strobecorp.com
 executables: 
 - strobe
@@ -106,6 +80,7 @@ extra_rdoc_files: []
 files: 
 - lib/strobe/association.rb
 - lib/strobe/cli/deploy_progress.rb
+- lib/strobe/cli/input.rb
 - lib/strobe/cli/main.rb
 - lib/strobe/cli/preview.rb
 - lib/strobe/cli/settings.rb
@@ -134,6 +109,8 @@ files:
 - lib/strobe/sproutcore.rb
 - lib/strobe/validations.rb
 - lib/strobe.rb
+- CHANGELOG.md
+- README.md
 - bin/strobe
 has_rdoc: true
 homepage: http://rubygems.org/gems/strobe
@@ -149,23 +126,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 3
-      - 6
       version: 1.3.6
 requirements: []
 
 rubyforge_project: strobe
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A deployment tool for HTML5 applications