RubyGems - strobe - Versions diffs - 0.2.0.beta.2 → 0.2.0 - Mend

strobe 0.2.0.beta.2 → 0.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (21) hide show

data/lib/strobe.rb +4 -2
data/lib/strobe/addons/social.rb +21 -110
data/lib/strobe/addons/social/facebook.rb +83 -0
data/lib/strobe/addons/social/twitter.rb +159 -0
data/lib/strobe/cli.rb +9 -3
data/lib/strobe/cli/deploys.rb +56 -0
data/lib/strobe/cli/main.rb +132 -17
data/lib/strobe/cli/preview.rb +20 -13
data/lib/strobe/cli/users.rb +1 -1
data/lib/strobe/collection.rb +8 -0
data/lib/strobe/config.rb +3 -2
data/lib/strobe/connection.rb +4 -2
data/lib/strobe/middleware/proxy.rb +12 -5
data/lib/strobe/resources.rb +1 -0
data/lib/strobe/resources/application.rb +37 -2
data/lib/strobe/resources/assignment.rb +2 -2
data/lib/strobe/resources/build.rb +13 -0
data/lib/strobe/resources/deploy.rb +2 -4
data/lib/strobe/sproutcore.rb +6 -2
data/lib/strobe/version.rb +3 -0
metadata +10 -5

data/lib/strobe.rb CHANGED

@@ -8,6 +8,8 @@ require 'active_support/core_ext/hash/indifferent_access'
 require 'active_support/core_ext/string/inflections'
 module Strobe
+  require 'strobe/version'
   autoload :Association,       'strobe/association'
   autoload :CLI,               'strobe/cli'
   autoload :Collection,        'strobe/collection'
@@ -50,8 +52,8 @@ module Strobe
     end
   end
-  class RequestError          < NotifiableError ; end
-  class ServerError           < NotifiableError ; end
+  class RequestError < NotifiableError ; end
+  class ServerError  < NotifiableError ; end
   def self.connection
     @connection

data/lib/strobe/addons/social.rb CHANGED

@@ -1,129 +1,40 @@
-require 'oauth'
 module Strobe
   module Addons
     class Social
-      TWITTER_URL = "http://api.twitter.com"
-      REQUEST_TOKEN_SECRETS = {}
-      ACCESS_TOKEN_SECRETS  = {}
+      ADDON_PATH = %r[/([^/]+)(/.*)?]i
       def initialize(settings)
-        @settings        = settings
-        @cookie_key      = "twitter_access_token"
-        @consumer_key    = settings['social.twitter.consumer_key']
-        @consumer_secret = settings['social.twitter.consumer_secret']
-        unless @consumer_key
-          raise "Social addon requires `social.twitter.consumer_key` configuration"
-        end
-        unless @consumer_secret
-          raise "Social addon requires `social.twitter.consumer_secret` configuration"
-        end
-        @consumer = OAuth::Consumer.new(@consumer_key, @consumer_secret, :site => TWITTER_URL)
+        @settings = settings
       end
       def call(env)
-        dup._call(env)
-      end
-      def _call(env)
-        @request = Rack::Request.new(env)
-        case env["PATH_INFO"]
-        when "/twitter/authenticate"
-          get_request_token
-        when "/twitter/callback"
-          get_access_token
-        when %r[^/twitter(.*)$]
-          proxy
-        else
-          msg = "Not found"
-          [404, {"Content-Length" => msg.bytesize.to_s}, [msg]]
-        end
-      end
-    private
-      def get_request_token
-        request_token = @consumer.get_request_token(:oauth_callback => callback_url)
-        REQUEST_TOKEN_SECRETS[request_token.token] = request_token.secret
-        response = Rack::Response.new
-        response.redirect(request_token.authorize_url(:oauth_callback => callback_url))
-        response.finish
-      end
+        if env["PATH_INFO"] =~ ADDON_PATH
+          addon, path = $1, $2
-      def get_access_token
-        response = Rack::Response.new
+          env = env.merge("SCRIPT_NAME" => "/_strobe/social/#{addon}", "PATH_INFO" => path || "")
-        oauth_token    = @request.params["oauth_token"]
-        oauth_verifier = @request.params["oauth_verifier"]
-        request_token  = REQUEST_TOKEN_SECRETS[oauth_token]
-        if oauth_token && request_token
-          request_token = OAuth::RequestToken.new(@consumer, oauth_token, request_token)
-          access_token = request_token.get_access_token(:oauth_verifier => oauth_verifier)
-          ACCESS_TOKEN_SECRETS[access_token.token] = access_token.secret
-          response.body = ['<html><head><script>window.opener?window.close():(window.location = "/")</script></head></html>']
-          response.set_cookie(@cookie_key, :value => access_token.token, :path => "/")
-          response.finish
+          if addon_class = find_addon(addon)
+            addon_class.new(@settings).call(env)
+          else
+            [404, {}, ["Not found"]]
+          end
         else
-          msg = "Could not match oauth response with an oauth request. Was the server restarted?\n"
-          [404, {"Content-Type" => "text/plain", "Content-Length" => msg.bytesize.to_s}, msg]
+          [404, {}, ["Not found"]]
         end
       end
-      def proxy
-        token         = @request.cookies[@cookie_key]
-        access_token  = OAuth::AccessToken.new(@consumer, token, ACCESS_TOKEN_SECRETS[token])
-        request_method  = @request.request_method.to_s.upcase
-        request_path    = @request.fullpath.sub(%r<^/_strobe/social/twitter>, "")
-        request_body    = @request.body.read
-        request_headers = {}
-        request_headers["Content-Type"] = @request.content_type if @request.content_type.present?
-        request_headers["Content-Length"] = @request.content_length if @request.content_length.present?
-        http = Net::HTTP.new(URI.parse(TWITTER_URL).host, URI.parse(TWITTER_URL).port)
-        oauth_request = Net::HTTPGenericRequest.new(request_method, request_body.present?, request_method != "HEAD", request_path, request_headers)
-        oauth_request.body = request_body if request_body.present?
-        oauth_request.oauth!(http, @consumer, access_token)
-        response_headers = {}
-        response_headers["Authorization"] = oauth_request["Authorization"]
-        response_headers["X-Strobe-Forward-Headers"] = "Authorization"
-        response_headers["X-Strobe-Location"] = URI.join(TWITTER_URL, request_path).to_s
-        response_headers["X-Strobe-Redirect-Method"] = request_method
-        if oauth_request["Content-Type"].present?
-          response_headers["X-Strobe-Forward-Headers"] += ",Content-Type"
-          response_headers["Content-Type"] = oauth_request["Content-Type"]
-        end
+      private
-        if oauth_request["Content-Length"].present?
-          response_headers["X-Strobe-Forward-Headers"] += ",Content-Length"
-          response_headers["Content-Length"] = oauth_request["Content-Length"]
+      def find_addon(addon)
+        class_name = addon.camelize
+        Strobe::Addons::Social.const_get(class_name)
+      rescue
+        begin
+          require "strobe/addons/social/#{addon}"
+          Strobe::Addons::Social.const_get(class_name)
+        rescue
+          nil # not found
         end
-        [302, response_headers, [request_body]]
-      end
-      def root_url
-        url_for("")
-      end
-      def callback_url
-        url_for("/twitter/callback")
-      end
-      def url_for(path)
-        # host_with_port returns http://localhost:9293 in tests
-        "#{@request.scheme}://#{@request.host_with_port.sub(%r<^https?://>, "")}#{@request.script_name}#{path}"
       end
     end
   end

data/lib/strobe/addons/social/facebook.rb ADDED

@@ -0,0 +1,83 @@
+require "cgi"
+module Strobe
+  module Addons
+    class Social
+      class Facebook
+        COOKIE_KEY = "facebook_access_token"
+        class NotFoundError < StandardError
+          def code; 404 end
+        end
+        def initialize(settings)
+          @settings = settings
+        end
+        def call(env)
+          dup._call(env)
+        rescue NotFoundError => error
+          Rack::Response.new("#{error.message}\n", error.code, "Content-Type" => "text/plain").finish
+        end
+        def _call(env)
+          @request = Rack::Request.new(env)
+          @response = Rack::Response.new
+          case @request.path_info
+          when "/callback"
+            callback
+          when "/status"
+            status
+          else
+            raise NotFoundError, "Not found"
+          end
+          @response.finish
+        end
+        private
+        def callback
+          body = <<-EOHTML
+<html><head><script>
+var i, l, a, e, kv, p = (window.location.toString().split("#", 2)[1] || "").split("&");
+for (i = 0, l = p.length; i < l; i++) {
+    kv = p[i].split("=", 2);
+    switch (kv[0]) {
+    case "access_token":
+        a = kv[1];
+        break;
+    case "expires_in":
+        e = kv[1];
+        break;
+    }
+}
+if (a && e) {
+    document.cookie = "#{COOKIE_KEY}=" + decodeURIComponent(a) + "; path=/_strobe/social/facebook; expires=" + new Date(+new Date() + +e * 1000).toString();
+}
+window.opener ? window.close() : window.location = "/";
+</script></head></html>
+EOHTML
+          @response["Content-Type"] = "text/html"
+          @response.write(body)
+        end
+        def status
+          @response["Content-Type"] = "text/plain"
+          if token.present?
+            @response.write("OK")
+          else
+            @response.write("UNAUTHORIZED")
+          end
+        end
+        private
+        def token
+          CGI.escape(@request.cookies[COOKIE_KEY].to_s)
+        end
+      end
+    end
+  end
+end

data/lib/strobe/addons/social/twitter.rb ADDED

@@ -0,0 +1,159 @@
+require "oauth"
+module Strobe
+  module Addons
+    class Social
+      class Twitter
+        COOKIE_KEY = "twitter_access_token"
+        REQUEST_TOKEN_SECRETS = {}
+        ACCESS_TOKEN_SECRETS  = {}
+        class NotFoundError < StandardError
+          def code; 404 end
+        end
+        class ServerError < StandardError
+          def code; 500 end
+        end
+        def initialize(settings)
+          @settings        = settings
+          @consumer_key    = settings["social.twitter.consumer_key"]
+          @consumer_secret = settings["social.twitter.consumer_secret"]
+          @url             = settings["social.twitter.url"] || "http://api.twitter.com"
+          @consumer        = OAuth::Consumer.new(@consumer_key, @consumer_secret, :site => @url)
+        end
+        def call(env)
+          dup._call(env)
+        rescue ServerError, NotFoundError => error
+          Rack::Response.new("#{error.message}\n", error.code, "Content-Type" => "text/plain").finish
+        end
+        def _call(env)
+          @request = Rack::Request.new(env)
+          @response = Rack::Response.new
+          raise ServerError, "Social addon requires `social.twitter.consumer_key` configuration" unless @consumer_key
+          raise ServerError, "Social addon requires `social.twitter.consumer_secret` configuration"unless @consumer_secret
+          case @request.path_info
+          when "/authentication"
+            env['REQUEST_METHOD'] == 'DELETE' ?
+              unauthenticate : authenticate
+          when "/callback"
+            callback
+          else
+            proxy
+          end
+          @response.finish
+        rescue Exception => e
+          puts e.message
+          puts e.backtrace
+        end
+        private
+        def authenticate
+          @response['content-type'] = 'application/json'
+          if ACCESS_TOKEN_SECRETS[token]
+            @response.body << {
+              :authentication => {
+                :status             => 'authenticated',
+                :authentication_uri => nil
+              }
+            }.to_json
+          else
+            if oauth_callback = @request.params["oauth_callback"]
+              request_token = @consumer.get_request_token(:oauth_callback => oauth_callback)
+              REQUEST_TOKEN_SECRETS[request_token.token] = request_token.secret
+              @response.body << {
+                :authentication => {
+                  :status             => 'unauthenticated',
+                  :authentication_uri => request_token.authorize_url(:oauth_callback => oauth_callback)
+                }
+              }.to_json
+            else
+              @response.status = 422
+              @response.body = ['{"errors": {"request": "The OAuth callback must be specified."}}']
+            end
+          end
+        end
+        def unauthenticate
+          @response.status = 204
+          @response.delete_cookie(COOKIE_KEY)
+        end
+        def callback
+          @response.write('<html><head><script>window.opener?window.close():(window.location="/")</script></head></html>')
+          @response["Content-Type"] = "text/html"
+          unless @request.params["denied"]
+            oauth_token = @request.params["oauth_token"]
+            oauth_verifier = @request.params["oauth_verifier"]
+            request_token_secret = REQUEST_TOKEN_SECRETS[oauth_token]
+            raise NotFoundError, "Could not find a proper request token. Was the server restarted?" unless request_token_secret
+            if oauth_token && request_token_secret
+              request_token = OAuth::RequestToken.new(@consumer, oauth_token, request_token_secret)
+              access_token = request_token.get_access_token(:oauth_verifier => oauth_verifier)
+              ACCESS_TOKEN_SECRETS[access_token.token] = access_token.secret
+              @response.set_cookie(COOKIE_KEY, :value => access_token.token, :path => "/_strobe/social/twitter")
+            end
+          end
+        end
+        def proxy
+          token_secret = ACCESS_TOKEN_SECRETS[token]
+          raise NotFoundError, "Could not find a proper access token. Was the server restarted?" unless token_secret
+          access_token  = OAuth::AccessToken.new(@consumer, token, token_secret)
+          request_method  = @request.request_method.to_s.upcase
+          request_path    = @request.fullpath.sub(%r<^/_strobe/social/twitter>, "")
+          request_body    = @request.body.read
+          request_headers = {}
+          request_headers["Content-Type"] = @request.content_type if @request.content_type.present?
+          request_headers["Content-Length"] = @request.content_length if @request.content_length.present?
+          http = Net::HTTP.new(URI.parse(@url).host, URI.parse(@url).port)
+          oauth_request = Net::HTTPGenericRequest.new(request_method, request_body.present?, request_method != "HEAD", request_path, request_headers)
+          oauth_request.body = request_body if request_body.present?
+          oauth_request.oauth!(http, @consumer, access_token)
+          @response["Authorization"] = oauth_request["Authorization"]
+          @response["X-Strobe-Forward-Headers"] = "Authorization"
+          @response["X-Strobe-Location"] = URI.join(@url, request_path).to_s
+          @response["X-Strobe-Redirect-Method"] = request_method
+          if oauth_request["Content-Type"].present?
+            @response["X-Strobe-Forward-Headers"] += ",Content-Type"
+            @response["Content-Type"] = oauth_request["Content-Type"]
+          end
+          if oauth_request["Content-Length"].present?
+            @response["X-Strobe-Forward-Headers"] += ",Content-Length"
+            @response["Content-Length"] = oauth_request["Content-Length"]
+          end
+          @response.body = [request_body]
+          @response.status = 302
+        end
+        private
+        def token
+          @request.cookies[COOKIE_KEY]
+        end
+      end
+    end
+  end
+end

data/lib/strobe/cli.rb CHANGED

@@ -13,6 +13,7 @@ module Strobe
     autoload :Ticker,         'strobe/cli/ticker'
     autoload :Users,          'strobe/cli/users'
     autoload :Input,          'strobe/cli/input'
+    autoload :Deploys,        'strobe/cli/deploys'
     include Resources
@@ -20,17 +21,17 @@ module Strobe
     class_option "yes", :type => :boolean, :aliases => "-y", :banner => "answer yes to all confirmation questions"
     def self.start(args)
-      $ARGV = args
+      $__ARGV = args
       IdentityMap.wrap do
         super
       end
     rescue NotifiableError => e
-      raise if $ARGV.include?('--backtrace')
+      raise if $__ARGV.include?('--backtrace')
       STDERR.puts "[ERROR] #{e.message}"
       ExceptionNotifier.notify(e, :action => args.join(" "))
       abort
     rescue StrobeError => e
-      raise if $ARGV.include?('--backtrace')
+      raise if $__ARGV.include?('--backtrace')
       STDERR.puts "[ERROR] #{e.message}"
       abort
     rescue Interrupt
@@ -91,6 +92,11 @@ module Strobe
       @config = Config.new_or_stub(path) || Config.stub!(path)
     end
+    def application_dir?
+      File.exist?("#{path}/strobe/config.json") ||
+        File.exist?("#{path}/.strobe") || nil # return true or nil
+    end
     def settings
       @settings ||= Settings.for(path)
     end

data/lib/strobe/cli/deploys.rb ADDED

@@ -0,0 +1,56 @@
+module Strobe
+  class CLI::Deploys < CLI
+    method_option "application-id", :type => :numeric, :banner => "Use application with given id"
+    action "list", "list deploys" do
+      id = options['application-id'] || config[:application_id]
+      app = Application.get!(id)
+      deploys = app.deploys.all
+      deploys_table deploys
+    end
+    method_option "application-id", :type => :numeric, :banner => "Use application with given id"
+    method_option "full",           :type => :boolean, :banner => "Display full deploy info"
+    method_option "include-builds", :type => :boolean, :banner => "Include builds data"
+    action "show", "show the last deploy" do |*args|
+      sha = args.first
+      id = options['application-id'] || config[:application_id]
+      app = Application.get!(id)
+      deploy = sha ? app.deploys.where(:id => sha) : Deploy.where(:limit => 1, :application_id => id).first
+      puts "deploy #{deploy[:id]}"
+      if options['full'] || options['include-builds']
+        puts <<-DEPLOY
+Author: #{deploy[:name]} <#{deploy[:email]}>
+Date: #{deploy[:created_at]}
+    #{deploy[:message]}
+DEPLOY
+      end
+      if options['include-builds']
+        deploy.builds.all.each do |build|
+          puts
+          puts "Build ##{build[:id]}"
+          puts "Status: #{build[:status]}"
+          puts "Download uri: #{build[:download_uri]}"
+        end
+      end
+    end
+    private
+    def deploys_table(deploys)
+      table deploys do |t|
+        t.column :key    do |d| (d[:sha1] || d[:id])[0..7] end
+        t.column :name
+        t.column :email
+        t.column :message
+      end
+    end
+  end
+end

data/lib/strobe/cli/main.rb CHANGED

@@ -12,9 +12,64 @@ module Strobe
       end
     end
+    desc "version", "Prints the version information"
+    def version
+      puts "Strobe version #{VERSION}"
+    end
+    map %w(-v --version) => :version
+    # TODO: add ability to extend CLI with addons
+    # TODO: remove this after it works in Hellfire
+    method_option "provisioning-profile", :type => :string
+    method_option "certificate",          :type => :string
+    method_option "application-id",       :type => :numeric, :banner => "Use application with given id"
+    action "phonegap:configure:ios", "configure ios for phonegap" do
+      pswd = @input.ask_for_password "password: "
+      provisioning_path = options["provisioning-profile"]
+      certificate_path  = options["certificate"]
+      id = options['application-id'] || config[:application_id]
+      response = Strobe.connection.get "/applications/#{id}?include=platform_installs"
+      if response.status == 200
+        ios = response.body["platform_installs"].detect { |p| p["platform_id"] == 1 }
+        if ios
+          boundary = "57f5d6d3e21c57f5d6d3e2157f5d6d3e21c57f5"
+          body = []
+          body << "--#{boundary}\r\n"
+          body << "Content-Disposition: form-data; name=\"application[ios_cert_file]\"; filename=\"cert.p12\"\r\n"
+          body << "Content-Type: application/octet-stream\r\n"
+          body << "\r\n"
+          body << File.read(certificate_path)
+          body << "\r\n--#{boundary}\r\n"
+          body << "Content-Disposition: form-data; name=\"application[ios_profile_file]\"; filename=\"provision.mobileprovision\"\r\n"
+          body << "Content-Type: application/octet-stream\r\n"
+          body << "\r\n"
+          body << File.read(provisioning_path)
+          body << "\r\n--#{boundary}\r\n"
+          body << "Content-Disposition: form-data; name=\"application[ios_password]\"\r\n"
+          body << "\r\n"
+          body << "#{pswd}\r\n"
+          body << "--#{boundary}--\r\n"
+          response = Strobe.connection.post "/platform_installs/#{ios["id"]}/pages/configuration", body.join, "Content-Type" => "multipart/form-data; boundary=#{boundary}", "Connection" => ""
+          if response.status == 201 || response.status == 204
+            say "Successfuly updated ios keys"
+          else
+            say "Something went wrong, server responded with #{response.status}:"
+            puts response.body
+          end
+        else
+          say "[ERROR] ios seems to be not installed in this application"
+        end
+      else
+        say "[ERROR] #{response.body}"
+      end
+    end
     method_option "global", :type => :boolean, :banner => "Set option globally (for all applications)"
     method_option "unset",  :type => :boolean, :banner => "Unset a config option"
-    action "config", "configure strobe", :usage => "config [KEY] [VALUE]" do |key, val = nil|
+    action "config", "configure strobe", :usage => "config [KEY] [VALUE]" do |key, *val|
+      val = val.first
       case
       when val
         if options[:global]
@@ -37,7 +92,7 @@ module Strobe
     end
     action "users", 'manage users' do |*args|
-      argv = $ARGV[1..-1]
+      argv = $__ARGV[1..-1]
       argv = [ 'list' ] + argv if args.empty?
       CLI::Users.start(argv)
     end
@@ -49,18 +104,10 @@ module Strobe
       Launchy.open("http://#{url}")
     end
-    action "deploys", "manage deploys" do
-      id = options['application-id'] || config[:application_id]
-      app = Application.new(:id => id)
-      deploys = app.deploys.all
-      table deploys do |t|
-        t.column :key    do |d| d[:id][0..7] end
-        t.column :parent do |d| d[:parent] ? d[:parent][0..7] : "" end
-        t.column :name
-        t.column :email
-        t.column :message
-      end
+    action "deploys", "manage deploys" do |*args|
+      argv = $__ARGV[1..-1]
+      argv = [ 'list' ] + argv if args.empty?
+      CLI::Deploys.start(argv)
     end
     action "signup", "signup for a new Strobe account" do
@@ -115,6 +162,30 @@ module Strobe
     end
     application_path_option
+    method_option "message", :type => :string,  :banner => "add rollback message", :aliases => "-m"
+    method_option "staging", :type => :boolean, :banner => "rollback a staging environment"
+    action "rollback", "rollback application to a state from given deploy" do |sha|
+      ensure_computer_is_registered
+      id = options['application-id'] || config[:application_id]
+      resource Application.get!(id)
+      host = resource[:url]
+      host = "staging.#{host}" if options[:staging]
+      unless agree "Rolling back '#{resource[:name]}' to #{sha} for http://#{host}, continue? [Yn] "
+        say "exiting..."
+        exit
+      end
+      host = resource.rollback! sha, :environment => options[:staging] && 'staging',
+                                     :message     => options[:message]
+      say "The application has successfully been rolled back to #{sha} and is available at #{host}"
+    end
+    application_path_option
+    method_option "message",     :type => :string,  :banner => "add deploy message", :aliases => "-m"
     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"
@@ -161,8 +232,11 @@ module Strobe
       host = resource.deploy! :environment => options[:staging] && 'staging',
                               :callback    => CLI::DeployProgress.new,
+                              :message     => options[:message] || git_message,
                               :sproutcore  => is_sproutcore?,
-                              :bpm_project => bpm_project
+                              :bpm_project => bpm_project,
+                              :scm_version => scm_version,
+                              :github_url  => github_url
       say "The application has successfully been deployed and is available at #{host}"
     end
@@ -192,7 +266,7 @@ module Strobe
     application_path_option
     method_option "application-id", :type => :numeric, :banner => "Delete application with given id"
     action "delete", "delete a specific application" do
-      id = options['application-id'] || config[:application_id]
+      id = options['application-id'] || (application_dir? && config[:application_id])
       resource(id ? Application.get!(id) : pick_application)
       say "Deleting application '#{resource[:name]}'"
@@ -321,12 +395,53 @@ module Strobe
     end
     def get_application(opts = {})
-      unless id = opts.delete(:application_id) || config[:application_id]
+      unless application_dir? && (id = opts.delete(:application_id) || config[:application_id])
         error "No application found. Are you currently in the correct directory?"
         exit 1
       end
       Application.get!(id, opts)
     end
+    def git_repo?
+      @is_git_repo ||= begin
+        git_config_path = "#{path}/.git/config"
+        File.exist?(git_config_path)
+      end
+    end
+    def github_url
+      @github_url ||= if git_repo?
+        case git "config remote.origin.url"
+        when %r[^git@github.com:(.*?)\.git$]i
+          "https://github.com/#{$1}"
+        when %r[^https?://[^@]+@github\.com/(.*?)\.git$]i
+          "https://github.com/#{$1}"
+        when %r[^git://github\.com/(.*?)\.git]i
+          "https://github.com/#{$1}"
+        end
+      end
+    end
+    def scm_version
+      @scm_version ||= git "rev-parse HEAD" if git_repo?
+    end
+    def git_message
+      return unless git_repo?
+      msg = git "cat-file commit #{scm_version}"
+      return unless msg
+      msg.split("\n\n", 2).last
+    end
+    def git(cmd)
+      Dir.chdir path do
+        retval = `git #{cmd}`
+        retval.chomp if $? == 0
+      end
+    end
   end
 end

data/lib/strobe/cli/preview.rb CHANGED

@@ -11,22 +11,15 @@ module Strobe
       alias wrapped_app app
     end
-  private
-    def preview_strobe_application
-      is_sproutcore?? preview_sproutcore_application : preview_html_application
-    end
-    def bpm_project
-      @bpm_project ||= BPM::Project.nearest_project(Dir.pwd)
-    end
-    def preview_html_application
+    def wrap(endpoint)
       project = bpm_project
+      c = config
+      s = settings
       app = Rack::Builder.new do
         use Middleware::Proxy
-        use Middleware::Addons
+        use Middleware::Addons, :config => c, :settings => s
         use Middleware::Rewrite
         if project
@@ -36,15 +29,29 @@ module Strobe
         end
         map "/" do
-          run Rack::Static.new lambda { |e| [] }, :urls => [ '/' ], :root => '.'
+          run endpoint
         end
       end.to_app
+    end
+  private
+    def preview_strobe_application
+      is_sproutcore?? preview_sproutcore_application : preview_html_application
+    end
+    def bpm_project
+      @bpm_project ||= BPM::Project.nearest_project(Dir.pwd)
+    end
+    def preview_html_application
+      app = wrap(Rack::Static.new lambda { |e| [] }, :urls => [ '/' ], :root => '.')
       Server.start :app => app, :host => '0.0.0.0', :server => "thin", :Port => 9292
     end
     def preview_sproutcore_application
       require 'strobe/sproutcore'
+      SC::Rack::Service.strobe_stack(self)
       SC::Tools.start ['server'] + ARGV[1..-1] + [ '--port', '9292' ]
     end
   end

data/lib/strobe/cli/users.rb CHANGED

@@ -56,7 +56,7 @@ module Strobe
     def current_application
       return @current_application if @current_application
-      unless id = config[:application_id]
+      unless application_dir? && id = config[:application_id]
         error "No application found. Are you currently in the correct directory?"
         exit 1
       end

data/lib/strobe/collection.rb CHANGED

@@ -49,6 +49,14 @@ module Strobe
       to_a.length
     end
+    def first
+      to_a.first
+    end
+    def last
+      to_a.last
+    end
     def new(params = {})
       klass.new(@params.merge(params))
     end

data/lib/strobe/config.rb CHANGED

@@ -19,7 +19,8 @@ module Strobe
           c = YAML.load_file(old_config_path)
           if Hash === c && application_id = c['STROBE_APPLICATION_ID']
             c.delete('STROBE_APPLICATION_ID')
-            stub!(application_root, application_id.to_i)
+            inst = stub!(application_root, application_id.to_i)
+            inst
           end
         end
       end
@@ -104,7 +105,7 @@ module Strobe
       # to inject the application_id key at the very beginning
       elsif @hash.keys.length > 1
         json = raw_json
-        json.sub!(/^(\s*){\s*(})?/m) do |m|
+        json.sub!(/^(\s*)\{\s*(\})?/m) do |m|
           lines = "#{$1}{\n" \
                   "#{$1}  // The Strobe Platform ID for the application. This is how the local\n" \
                   "#{$1}  // application is mapped to one on the server.\n" \

data/lib/strobe/connection.rb CHANGED

@@ -149,7 +149,7 @@ module Strobe
       def build_http
         http = Net::HTTP.new host, port || 80
-        http.read_timeout = 60
+        http.read_timeout = 900 # For deploys
         http.open_timeout = 10
         http
       end
@@ -189,7 +189,9 @@ module Strobe
       end
       if body
-        headers['content-type'] ||= 'application/json'
+        if Hash === body
+          headers['content-type'] ||= 'application/json'
+        end
         if headers['content-type'] == 'application/json'
           body = ActiveSupport::JSON.encode(body)

data/lib/strobe/middleware/proxy.rb CHANGED

@@ -32,7 +32,12 @@ module Strobe
         env['REQUEST_METHOD']    = hdrs['x-strobe-redirect-method']
         env['REQUEST_METHOD']  ||= is_head ? 'HEAD' : 'GET'
         env['async.callback']    = callback
-        env['rack.input']        = StringIO.new(body.join)
+        # Rack::Request doesn't have join method
+        body_str = ""
+        body.each { |chunk| body_str << chunk }
+        env['rack.input']        = StringIO.new(body_str)
         env
       end
@@ -84,9 +89,10 @@ module Strobe
       def call(env)
         if env['PATH_INFO'] =~ PROXY_PATH
+          p1, p2     = $1, $2
           scheme     = scheme_from_env(env)
-          host, port = $1.split(':')
-          path       = $2 || '/'
+          host, port = p1.split(':')
+          path       = p2 || '/'
           port       = (port || 80).to_i
           url = "#{scheme}://#{host}"
@@ -213,8 +219,9 @@ module Strobe
           @redirect = headers['Location'] && @http.req.follow_redirect?
           unless @redirect
-            headers = headers.select { |k,v| !block_headers.include?(k.downcase) }
-            headers = headers.merge(extra_headers)
+            h = {}
+            headers.each { |k,v| h[k] = v if !block_headers.include?(k.downcase) }
+            headers = h.merge(extra_headers)
             @response_headers = ::Rack::Utils::HeaderHash.new(headers)
             @body = DeferrableBody.new(self) if has_response_body?
             respond(@http.response_header.status, @response_headers)

data/lib/strobe/resources.rb CHANGED

@@ -10,5 +10,6 @@ module Strobe
     require 'strobe/resources/team'
     require 'strobe/resources/user'
     require 'strobe/resources/deploy'
+    require 'strobe/resources/build'
   end
 end

data/lib/strobe/resources/application.rb CHANGED

@@ -1,4 +1,5 @@
 require 'zlib'
+require 'uri'
 require 'digest/sha1'
 module Strobe
@@ -15,17 +16,51 @@ module Strobe
       validates "account", "name", :presence => true
+      def rollback!(sha, opts = {})
+        environment = opts[:environment]
+        message     = opts[:message]
+        id = self[:id]
+        request do
+          qs = []
+          qs << "environment=#{environment}"  if environment
+          qs << "message=#{message}"          if message
+          qs << "deploy=#{sha}"
+          qs << "application_id=#{id}"
+          uri = URI.escape("/deploys?#{qs.join('&')}")
+          response = connection.post(uri)
+          response
+        end
+        [ environment, self['url'] ].compact.join('.')
+      end
       def deploy!(opts = {})
         self['path'] = opts[:path] if opts[:path]
         environment  = opts[:environment]
         callback     = opts[:callback]
+        message      = opts[:message]
+        github_url   = opts[:github_url]
+        scm_version  = opts[:scm_version]
         validate_for_deploy or return
         request do
-          qs       = "?environment=#{environment}" if environment
+          qs = []
+          qs << "environment=#{environment}"           if environment
+          qs << "message=#{message}"                   if message
+          qs << "github_url=#{URI.escape(github_url)}" if github_url
+          qs << "scm_version=#{scm_version}"           if scm_version
+          uri = "#{http_uri}/deploy"
+          uri = "#{uri}?#{qs.join('&')}" unless qs.blank?
+          uri = URI.escape(uri)
           packfile = build_packfile(opts)
-          response = connection.put("#{http_uri}/deploy#{qs}", packfile, packfile.headers)
+          response = connection.put(uri, packfile, packfile.headers)
           callback.deploy_complete if callback
           response
         end

data/lib/strobe/resources/assignment.rb CHANGED

@@ -3,8 +3,8 @@ module Strobe
     class Assignment
       include Resource::Collection
-      has 1, :team
-      has 1, :application
+      has 1, :team, :include => true
+      has 1, :application, :include => true
       validates :team, :application, :presence => true
     end

data/lib/strobe/resources/build.rb ADDED

@@ -0,0 +1,13 @@
+module Strobe
+  module Resources
+    class Build
+      include Resource::Collection
+      key :id,           String
+      key :download_uri, String
+      key :status,       String
+      has 1, :deploy
+    end
+  end
+end

data/lib/strobe/resources/deploy.rb CHANGED

@@ -1,14 +1,12 @@
-require 'zlib'
-require 'digest/sha1'
 module Strobe
   module Resources
     class Deploy
       include Resource::Collection
-      key :id, String
+      key :id,        String
       has 1, :application
+      has n, :builds
     end
   end
 end

data/lib/strobe/sproutcore.rb CHANGED

@@ -1,12 +1,16 @@
 require 'sproutcore'
 class SC::Rack::Service
+  def self.strobe_stack(obj = nil)
+    @strobe_stack = obj if obj
+    @strobe_stack
+  end
   def call(env)
     wrapped_app.call(env)
   end
   def wrapped_app
-    # @wrapped_app ||= Strobe::Middleware::Proxy.new(@app)
-    @app
+    @wrapped_app ||= self.class.strobe_stack.wrap(@app)
   end
 end

data/lib/strobe/version.rb ADDED

@@ -0,0 +1,3 @@
+module Strobe
+  VERSION = "0.2.0"
+end

metadata CHANGED

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: strobe
 version: !ruby/object:Gem::Version
-  prerelease: 6
-  version: 0.2.0.beta.2
+  prerelease:
+  version: 0.2.0
 platform: ruby
 authors:
 - Carl Lerche
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2011-07-18 00:00:00 +09:00
+date: 2011-08-16 00:00:00 -07:00
 default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
@@ -54,7 +54,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.4.5
   type: :runtime
   version_requirements: *id008
 - !ruby/object:Gem::Dependency
@@ -122,9 +122,12 @@ extensions: []
 extra_rdoc_files: []
 files:
+- lib/strobe/addons/social/facebook.rb
+- lib/strobe/addons/social/twitter.rb
 - lib/strobe/addons/social.rb
 - lib/strobe/association.rb
 - lib/strobe/cli/deploy_progress.rb
+- lib/strobe/cli/deploys.rb
 - lib/strobe/cli/input.rb
 - lib/strobe/cli/main.rb
 - lib/strobe/cli/preview.rb
@@ -148,6 +151,7 @@ files:
 - lib/strobe/resources/account.rb
 - lib/strobe/resources/application.rb
 - lib/strobe/resources/assignment.rb
+- lib/strobe/resources/build.rb
 - lib/strobe/resources/deploy.rb
 - lib/strobe/resources/me.rb
 - lib/strobe/resources/membership.rb
@@ -157,6 +161,7 @@ files:
 - lib/strobe/resources.rb
 - lib/strobe/sproutcore.rb
 - lib/strobe/validations.rb
+- lib/strobe/version.rb
 - lib/strobe.rb
 - CHANGELOG.md
 - README.md