strobe 0.1.6 → 0.2.0.beta.1

data/lib/strobe/middleware/rewrite.rb

@@ -6,12 +6,25 @@ module Strobe
 
     def call(env)
       status, hdrs, body = @app.call(env)
+      original_response = [status, hdrs, body]
 
       if status == 404
         path_info        = env['PATH_INFO']
         env['PATH_INFO'] = "#{path_info}/index.html".gsub('//', '/')
 
-        return @app.call(env)
+        status, hdrs, body = @app.call(env)
+
+        if status == 404
+          env['PATH_INFO'] = "/404.html"
+
+          status, hdrs, body = @app.call(env)
+
+          if status == 404
+            status, hdrs, body = original_response
+          else
+            status = 404
+          end
+        end
       end
 
       [ status, hdrs, body ]

data/lib/strobe/resource/base.rb

@@ -202,13 +202,13 @@ module Strobe
           errors = @response.body['errors']
 
           if msg = errors['request']
-            raise RequestError, msg
+            raise RequestError.new(msg, :request => @response.request, :response => @response)
           end
 
           errors = errors[root] if errors
           handle_errors(errors) if errors
         else
-          raise "Something went wrong"
+          raise ServerError.new(msg, :request => @response.request, :response => @response)
         end
 
         false

data/lib/strobe/resources.rb

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

data/lib/strobe/resources/application.rb

@@ -9,6 +9,7 @@ module Strobe
       has 1, :account
       has n, :teams
       has n, :users
+      has n, :deploys
 
       filter :path
 
@@ -44,11 +45,19 @@ module Strobe
       end
 
       def ensure_sane_application_path
-        if self[:path] && Dir["#{self[:path]}/**/*"].empty?
+        if self[:path] && empty?
           errors.add('path', 'is not a sane application directory')
         end
       end
 
+      def empty?
+        path  = self[:path]
+        files = Dir["#{path}/**/*"] -
+          Dir["#{path}/strobe/**/*"] -
+          ["#{path}/strobe"]
+        files.empty?
+      end
+
       def build_packfile(opts)
         Dir.chdir self[:path] do
           PackFile.build(opts) do |m|

data/lib/strobe/resources/deploy.rb

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

data/lib/strobe/sproutcore.rb

@@ -6,6 +6,7 @@ class SC::Rack::Service
   end
 
   def wrapped_app
-    @wrapped_app ||= Strobe::Middleware::Proxy.new(@app)
+    # @wrapped_app ||= Strobe::Middleware::Proxy.new(@app)
+    @app
   end
 end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: strobe
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.1.6
+  prerelease: 6
+  version: 0.2.0.beta.1
 platform: ruby
 authors: 
 - Carl Lerche
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-23 00:00:00 -07:00
+date: 2011-07-16 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,27 +47,60 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: thor
+  name: thin
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.14.0
+        version: 1.2.0
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: launchy
+  name: em-http-request
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !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 
+    none: false
+    requirements: 
+    - - ~>
+      - !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 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.4.4
+  type: :runtime
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: launchy
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id008
 description: The client library for deploying applications to Strobe's HTML5 deployment platform
 email: 
 - carl@strobecorp.com
@@ -78,6 +111,7 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- lib/strobe/addons/social.rb
 - lib/strobe/association.rb
 - lib/strobe/cli/deploy_progress.rb
 - lib/strobe/cli/input.rb
@@ -89,9 +123,12 @@ files:
 - lib/strobe/cli/users.rb
 - lib/strobe/cli.rb
 - lib/strobe/collection.rb
+- lib/strobe/config.rb
 - lib/strobe/connection.rb
+- lib/strobe/exception_notifier.rb
 - lib/strobe/identity_map.rb
 - lib/strobe/key.rb
+- lib/strobe/middleware/addons.rb
 - lib/strobe/middleware/proxy.rb
 - lib/strobe/middleware/rewrite.rb
 - lib/strobe/resource/base.rb
@@ -100,6 +137,7 @@ files:
 - lib/strobe/resources/account.rb
 - lib/strobe/resources/application.rb
 - lib/strobe/resources/assignment.rb
+- lib/strobe/resources/deploy.rb
 - lib/strobe/resources/me.rb
 - lib/strobe/resources/membership.rb
 - lib/strobe/resources/signup.rb
@@ -136,7 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: strobe
-rubygems_version: 1.6.2
+rubygems_version: 1.5.3
 signing_key: 
 specification_version: 3
 summary: A deployment tool for HTML5 applications