strobe 0.3.10 → 0.3.11

data/lib/strobe.rb

@@ -20,6 +20,7 @@ module Strobe
   autoload :Resources,         'strobe/resources'
   autoload :Validations,       'strobe/validations'
   autoload :ExceptionNotifier, 'strobe/exception_notifier'
+  autoload :Retryable,         'strobe/retryable'
 
   module Addons
     # Stubb out the Addons module
@@ -45,6 +46,8 @@ module Strobe
   class ValidationError            < StrobeError  ; end
   class OutdatedStrobeVersionError < StrobeError  ; end
   class InvalidPortError           < StrobeError  ; end
+  class InvalidAppPathError        < StrobeError  ; end
+
   class UnderMaintenanceError      < StrobeError
     def initialize
       super("We are currently down for maintenance. You can check our status " \

data/lib/strobe/cli/deploys.rb

@@ -4,31 +4,37 @@ module Strobe
   class CLI::Deploys < CLI
 
     method_option "application-id", :type => :numeric, :banner => "Use application with given id"
+    method_option "staging",        :type => :boolean, :banner => "Show staging deploys"
     action "list", "List all deploys for an application" do
+      env = options[:staging] ? "staging" : "production"
       app = get_application(options)
-      deploys = app.deploys.all
+      deploys = Deploy.where(:application_id => app.id, :environment => env)
 
-      deploys_table deploys
+      puts "All #{env} deploys\n\n"
+      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"
+    method_option "staging",        :type => :boolean, :banner => "Show last staging deploy"
     action "show", "Show the last deploy for an application" do |*args|
       sha = args.first
-
+      env = options[:staging] ? "staging" : "production"
       app = get_application(options)
-
-      deploy = sha ? app.deploys.where(:id => sha) : Deploy.where(:limit => 1, :application_id => app.id).first
+      deploy = sha ?
+                 app.deploys.find{|d| d[:sha1] == sha || d[:id] == sha } :
+                 Deploy.where(:application_id => app.id, :limit => 1, :environment => env).first
 
       raise NoDeploy.new("No deploys to show") unless deploy
 
       puts "deploy #{deploy[:sha1] || deploy[:id]}"
 
-      if options['full'] || options['include-builds']
+      if options['full'] || options['include-builds'] || sha
         puts <<-DEPLOY
 Author: #{deploy[:name]} <#{deploy[:email]}>
 Date: #{deploy[:created_at]}
+Environment: #{deploy['environment.name']}
 
     #{deploy[:message]}
 DEPLOY
@@ -48,9 +54,9 @@ DEPLOY
 
     def deploys_table(deploys)
       table deploys do |t|
-        t.column :key do |d| d[:sha1] || d[:id] end
-        t.column :name
-        t.column :email
+        t.column(:key){|d| d[:sha1] || d[:id] }
+        t.column :created_at, :header => "Date"
+        t.column(:user){|d| d[:name] || d[:email]}
         t.column :message
       end
     end

data/lib/strobe/cli/main.rb

@@ -190,6 +190,8 @@ LONGDESC
     method_option "production",      :type => :boolean, :banner => "deploy to a production 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 "bpm-rebuild",     :type => :boolean, :banner => "run `bpm rebuild` before deploying"
+    method_option "no-bpm-rebuild",  :type => :boolean, :banner => "skip the `bpm rebuild` step"
     method_option "url",                                :banner => "set application's url"
     long_desc <<-LONGDESC
       Deploy your application to the Strobe Platform.
@@ -201,6 +203,10 @@ LONGDESC
       To deploy to production, use `--production`.
     LONGDESC
     action "deploy", "Deploy your application to Strobe Platform" do
+      if Dir.pwd == Strobe.user_home
+        raise InvalidAppPathError.new("Can't deploy the home directory!")
+      end
+
       ensure_computer_is_registered
       env  = (options[:production] ? "production" : "staging")
 
@@ -239,7 +245,11 @@ LONGDESC
         end
       end
 
-      run_sc_build
+      # If there was an error in registration we don't want to continue
+      abort unless resource.errors.empty?
+
+      ran_sc_build  = run_sc_build
+      ran_bpm_rebuild = run_bpm_rebuild(ran_sc_build)
 
       begin
         host = resource.deploy! :environment => env,
@@ -374,6 +384,41 @@ LONGDESC
       unless CLI::Ticker.tick("Running `#{cmd}`", 2) { system cmd }
         error! "Something went wrong while running `#{cmd}`"
       end
+
+      return true
+    end
+
+    def run_bpm_rebuild(ran_sc_build=false)
+      return unless bpm_project
+
+      # Using both options at the same time makes no sense
+      if options["bpm-rebuild"] && options["no-bpm-rebuild"]
+        error! "--bpm-rebuild and --no-bpm-rebuild cannot be used at the same time"
+      end
+
+      # If the user explicitly says that they don't want to run bpm-rebuild,
+      # then just skip it
+      return if options["no-bpm-rebuild"]
+
+      cmd = "bpm rebuild"
+
+      # If the user doesn't ask either way, confirm first
+      unless options["bpm-rebuild"]
+        location = bpm_project.root_path == Dir.pwd ? "" : " located at #{bpm_project.root_path}"
+        say "This appears to be a BPM application#{location}."
+        return unless agree "Run `#{cmd}`? [Yn] "
+      end
+
+      if ran_sc_build
+        say "Can't build for both SproutCore 1.x and BPM! Skipping BPM rebuild."
+        return
+      end
+
+      unless CLI::Ticker.tick("Running `#{cmd}`", 2) { system cmd }
+        error! "Something went wrong while running `#{cmd}`"
+      end
+
+      return true
     end
 
     def is_sproutcore?
@@ -382,7 +427,7 @@ LONGDESC
 
     def bpm_project
       return nil unless defined?(BPM)
-      BPM::Project.nearest_project Dir.pwd
+      @bpm_project ||= BPM::Project.nearest_project Dir.pwd
     end
 
     def determine_application_root

data/lib/strobe/cli/settings.rb

@@ -128,6 +128,10 @@ module Strobe
     end
 
     def register_app_path(path)
+      if path == Strobe.user_home
+        raise InvalidAppPathError, "Can't register the home directory!"
+      end
+
       paths  = application_paths
       paths |= [File.expand_path(path.to_s)]
       global_set! :applications, paths

data/lib/strobe/cli/table.rb

@@ -61,7 +61,7 @@ module Strobe
         cell = "[#{index + 1}]"
       end
 
-      width = [ col[:max], 25 ].max + 5
+      width = [ col[:max], 8 ].max + 5
       cell.to_s.ljust(width)
     end
   end

data/lib/strobe/connection.rb

@@ -203,8 +203,8 @@ module Strobe
       end
 
       headers['authorization'] ||= authorization_header
-
-      headers['user-agent'] = Strobe.user_agent
+      headers['user-agent']      = Strobe.user_agent
+      headers['accept']          = 'application/json'
 
       if method == "GET" || method == "HEAD"
 

data/lib/strobe/resources.rb

@@ -12,5 +12,6 @@ module Strobe
     require 'strobe/resources/deploy'
     require 'strobe/resources/build'
     require 'strobe/resources/platform_install'
+    require 'strobe/resources/environment'
   end
 end

data/lib/strobe/resources/application.rb

@@ -9,6 +9,7 @@ module Strobe
   module Resources
     class Application
       include Resource::Collection
+      include Strobe::Retryable
 
       has 1, :account
       has n, :teams
@@ -26,7 +27,12 @@ module Strobe
 
       def web_install
         @web_install ||= begin
-          install = self.platform_installs.detect { |p| p.web? }
+          install = nil
+
+          retry_on_error([IOError, Timeout::Error]) do
+            install = self.platform_installs.detect { |p| p.web? }
+          end
+
           raise "Application does not have web platform" unless install
           install
         end
@@ -60,14 +66,20 @@ module Strobe
 
         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)
+          body = { :deploy => sha }
+          body[:environment] = environment if environment
+
+          headers = {
+            "Content-Type" => "application/json",
+            "Accept"       => "application/json"
+          }
+
+          response = connection.post(uri, body, headers)
           response
         end
 
@@ -158,17 +170,9 @@ module Strobe
               add_directory(m, project_path, "strobe/**/*")
             end
 
-            # Make sure to build bpm before add_directory **/* so
-            # we get the changes from the rebuild
-            if project = opts[:bpm_project]
-              project.rebuild_dependency_list(nil, false)
-              project.build :production, true
-            end
-
             # Add all files in current directory
             add_directory(m, ".", "**/*")
 
-
             if opts[:sproutcore]
               picked_root_app = false
 

data/lib/strobe/resources/deploy.rb

@@ -6,6 +6,7 @@ module Strobe
       key :id,        String
 
       has 1, :application
+      has 1, :environment, :include => true
       has n, :builds
     end
   end

data/lib/strobe/resources/environment.rb

@@ -0,0 +1,9 @@
+module Strobe
+  module Resources
+    class Environment
+      include Resource::Collection
+
+      key :id,        String
+    end
+  end
+end

data/lib/strobe/resources/platform_install.rb

@@ -6,7 +6,7 @@ module Strobe
       has 1, :application
 
       def update_uri
-        "/platform_installs/#{self[:id]}/configuration"
+        "/platform_installs/#{self[:id]}/pages/configuration"
       end
 
       def web?

data/lib/strobe/retryable.rb

@@ -0,0 +1,19 @@
+module Strobe
+  module Retryable
+    def retry_on_error(e, retries = 2)
+      e = Array.wrap(e)
+
+      tries = 0
+      begin
+        yield
+      rescue *e
+        tries += 1
+        if tries <= retries
+          retry
+        else
+          raise
+        end
+      end
+    end
+  end
+end

data/lib/strobe/version.rb

@@ -1,3 +1,3 @@
 module Strobe
-  VERSION = "0.3.10"
+  VERSION = "0.3.11"
 end

metadata

@@ -1,116 +1,113 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: strobe
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.3.11
   prerelease: 
-  version: 0.3.10
 platform: ruby
-authors: 
+authors:
 - Carl Lerche
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-03 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-10-21 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activemodel
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2153265580 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: mime-types
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2153265580
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: &2153419600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.16.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rack
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2153419600
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: &2154297300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.3.0
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: thin
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2154297300
+- !ruby/object:Gem::Dependency
+  name: thin
+  requirement: &2154496680 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.2.0
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: em-http-request
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *2154496680
+- !ruby/object:Gem::Dependency
+  name: em-http-request
+  requirement: &2154620040 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.0.0.beta
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: thor
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *2154620040
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: &2154721040 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.14.0
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: oauth
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *2154721040
+- !ruby/object:Gem::Dependency
+  name: oauth
+  requirement: &2154760480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.4.5
   type: :runtime
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: launchy
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *2154760480
+- !ruby/object:Gem::Dependency
+  name: launchy
+  requirement: &2154762000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id008
-description: The client library for deploying applications to Strobe's HTML5 deployment platform
-email: 
+  prerelease: false
+  version_requirements: *2154762000
+description: The client library for deploying applications to Strobe's HTML5 deployment
+  platform
+email:
 - carl@strobecorp.com
-executables: 
+executables:
 - strobe
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/strobe/addons/social/facebook.rb
 - lib/strobe/addons/social/twitter.rb
 - lib/strobe/addons/social.rb
@@ -142,6 +139,7 @@ files:
 - lib/strobe/resources/assignment.rb
 - lib/strobe/resources/build.rb
 - lib/strobe/resources/deploy.rb
+- lib/strobe/resources/environment.rb
 - lib/strobe/resources/me.rb
 - lib/strobe/resources/membership.rb
 - lib/strobe/resources/platform_install.rb
@@ -149,6 +147,7 @@ files:
 - lib/strobe/resources/team.rb
 - lib/strobe/resources/user.rb
 - lib/strobe/resources.rb
+- lib/strobe/retryable.rb
 - lib/strobe/sproutcore.rb
 - lib/strobe/validations.rb
 - lib/strobe/version.rb
@@ -157,33 +156,28 @@ files:
 - README.md
 - lib/strobe/certs/cacert.pem
 - bin/strobe
-has_rdoc: true
 homepage: http://rubygems.org/gems/strobe
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: strobe
-rubygems_version: 1.6.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: A deployment tool for HTML5 applications
 test_files: []
-