strobe 0.3.5 → 0.3.6

data/lib/strobe/cli.rb

@@ -36,7 +36,13 @@ module Strobe
         end
       end
     rescue NotifiableError => e
-      raise if $__ARGV.include?('--backtrace')
+      if $__ARGV.include?('--backtrace')
+        require 'pp'
+        puts "=== ERROR DATA ==="
+        pp e.data
+        puts "\n"
+        raise
+      end
       STDERR.puts "[ERROR] #{e.message}"
       ExceptionNotifier.notify(e, :action => args.join(" "))
       abort

data/lib/strobe/connection.rb

@@ -3,6 +3,15 @@ require 'net/http'
 require 'net/https'
 
 module Strobe
+
+  class JSONParseError < NotifiableError
+    def initialize(error = nil, body = nil)
+      set_backtrace(error.backtrace)
+      data = { :raw_body => body, :original_message => error.message }
+      super("Error parsing JSON from server", data)
+    end
+  end
+
   class Connection
     def self.host_and_port(uri)
       uri = "http://#{uri}" unless uri =~ %r[^https?://]
@@ -67,7 +76,7 @@ module Strobe
 
         case mime_type
         when :json
-          @body = ActiveSupport::JSON.decode(@response.body)
+          @body = json_decode(@response.body)
         else
           @body = @response.body
         end
@@ -113,6 +122,13 @@ module Strobe
           :json
         end
       end
+
+      def json_decode(data)
+        ActiveSupport::JSON.decode(@response.body)
+      rescue ActiveSupport::JSON.parse_error => e
+        raise JSONParseError.new(e, data)
+      end
+
     end
 
     class Request

data/lib/strobe/version.rb

@@ -1,3 +1,3 @@
 module Strobe
-  VERSION = "0.3.5"
+  VERSION = "0.3.6"
 end

metadata

@@ -1,113 +1,115 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: strobe
-version: !ruby/object:Gem::Version
-  version: 0.3.5
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 0.3.6
 platform: ruby
-authors:
+authors: 
 - Carl Lerche
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-01 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2011-09-02 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: activemodel
-  requirement: &2156401120 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 3.0.0
   type: :runtime
-  prerelease: false
-  version_requirements: *2156401120
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: mime-types
-  requirement: &2156400360 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 1.16.0
   type: :runtime
-  prerelease: false
-  version_requirements: *2156400360
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: rack
-  requirement: &2156399500 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 1.3.0
   type: :runtime
-  prerelease: false
-  version_requirements: *2156399500
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: thin
-  requirement: &2156398360 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 1.2.0
   type: :runtime
-  prerelease: false
-  version_requirements: *2156398360
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: em-http-request
-  requirement: &2156397400 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 1.0.0.beta
   type: :runtime
-  prerelease: false
-  version_requirements: *2156397400
-- !ruby/object:Gem::Dependency
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: thor
-  requirement: &2156389880 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 0.14.0
   type: :runtime
-  prerelease: false
-  version_requirements: *2156389880
-- !ruby/object:Gem::Dependency
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   name: oauth
-  requirement: &2156388480 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 0.4.5
   type: :runtime
-  prerelease: false
-  version_requirements: *2156388480
-- !ruby/object:Gem::Dependency
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
   name: launchy
-  requirement: &2156386900 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *2156386900
-description: The client library for deploying applications to Strobe's HTML5 deployment
-  platform
-email:
+  version_requirements: *id008
+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
@@ -156,26 +158,30 @@ files:
 - bin/strobe
 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.8.6
 signing_key: 
 specification_version: 3
 summary: A deployment tool for HTML5 applications
 test_files: []
+