strobe 0.0.2 → 0.0.2.1

data/lib/strobe.rb

@@ -1,6 +1,7 @@
 require 'base64'
 require 'active_model'
 require 'active_support/concern'
+require 'active_support/json'
 require 'active_support/core_ext/hash/deep_merge'
 require 'active_support/core_ext/hash/reverse_merge'
 require 'active_support/core_ext/hash/indifferent_access'

data/lib/strobe/cli.rb

@@ -40,7 +40,8 @@ module Strobe
     method_option "path", :type => :string, :banner => "The path to the application"
     def deploy
       path   = options[:path] || Dir.pwd
-      config = Settings.new(Pathname.new(path).join(".strobe/config"))
+      file   = ENV['STROBE_CONFIG'] || 'config'
+      config = Settings.new(Pathname.new(path).join(".strobe/#{file}"))
 
       _run :deploy, :config => config, :path => path
     end

data/lib/strobe/cli/actions.rb

@@ -49,8 +49,7 @@ module Strobe
 
     class DeployAction < CLI::Action
       def steps
-      ensure_computer_is_registered
-
+        ensure_computer_is_registered
 
         config = options[:config]
         path   = determine_path
@@ -68,12 +67,14 @@ module Strobe
 
           ask :name
           ask :url
-        end
 
-        save do
-          config[:application_id] ||= resource[:id]
-          say "The application has successfully been deployed and is available at #{resource[:url]}"
+          save do
+            config[:application_id] ||= resource[:id]
+          end
         end
+
+        resource.deploy!
+        say "The application has successfully been deployed and is available at #{resource[:url]}"
       end
 
     private

data/lib/strobe/cli/settings.rb

@@ -3,11 +3,13 @@ require 'yaml'
 module Strobe
   class CLI::Settings
     def self.global_config_file
-      Pathname.new(Strobe.user_home).join(".strobe/config")
+      file = ENV['STROBE_CONFIG'] || 'config'
+      Pathname.new(Strobe.user_home).join(".strobe/#{file}")
     end
 
     def self.application_config_file(root)
-      Pathname.new(root).join(".strobe/config")
+      file = ENV['STROBE_CONFIG'] || 'config'
+      Pathname.new(root).join(".strobe/#{file}")
     end
 
     def initialize(filename = self.class.global_config_file)

data/lib/strobe/connection.rb

@@ -1,12 +1,12 @@
 require 'base64'
-require 'faraday'
+require 'net/http'
 
 module Strobe
   class Connection
     attr_reader :url
 
     def initialize(url)
-      @url      = url
+      @url      = URI(url)
       @user     = nil
       @password = nil
     end
@@ -37,27 +37,100 @@ module Strobe
       request :delete, *args
     end
 
-    def request(method, path, body = '', headers = {})
-      connection = case headers['Content-Type']
-      when /^multipart\/form-data;/ then reg_connection
-      else json_connection
+    class Response
+      attr_reader :headers
+
+      def initialize(response)
+        @response = response
+        @headers  = {}
+
+        response.each_header do |key, val|
+          @headers[key] = val
+        end
+      end
+
+      def status
+        @response.code.to_i
+      end
+
+      def body
+        return @body if @body
+
+        case mime_type
+        when :json
+          @body = ActiveSupport::JSON.decode(@response.body)
+        else
+          @body = @response.body
+        end
+
+        @body
+      end
+
+      def success?
+        status == 200
+      end
+
+      def validate!
+        case status
+        when 401
+          # TODO Fix this on the server
+          raise UnauthenticatedError, body['errors']
+        when 404
+          raise ResourceNotFoundError, body['errors']
+        end
+
+        self
       end
 
-      resp = connection.run_request method, path, body, headers
+    private
 
-      case resp.status
-      when 401
-        # TODO Fix this on the server
-        raise UnauthenticatedError, resp.body['errors']
-      when 404
-        raise ResourceNotFoundError, resp.body['errors']
+      def mime_type
+        return nil unless content_type = headers['content-type']
+
+        if content_type =~ /^application\/json[,\;\s]/
+          :json
+        end
+      end
+    end
+
+    def request(method, path, body = nil, headers = {})
+      headers.keys.each do |key|
+        headers[key.downcase] = headers.delete(key)
       end
 
-      resp
+      headers['authorization'] ||= authorization_header
+
+      if body
+        headers['content-type'] ||= 'application/json'
+
+        if headers['content-type'] == 'application/json'
+          body = ActiveSupport::JSON.encode(body)
+        else
+          body = body.to_s
+        end
+      end
+
+      if body.respond_to?(:read)
+        request.body_stream = body
+        body = nil
+      end
+
+      http    = build_http
+      request = Net::HTTPGenericRequest.new(
+        method.to_s.upcase, !!body, true, path, headers)
+
+      Response.new(http.request(request, body)).validate!
     end
 
   private
 
+    def build_http
+      http = Net::HTTP.new @url.host, @url.port || 80
+      http.read_timeout = 60
+      http.open_timeout = 10
+      http
+    end
+
     def authorization_header
       auth = Base64.encode64("#{@user}:#{@password}")
       auth.gsub!("\n", "")
@@ -74,7 +147,6 @@ module Strobe
         b.use Faraday::Request::ActiveSupportJson
         b.use Faraday::Adapter::NetHttp
         b.use Faraday::Response::ActiveSupportJson
-        b.options[:timeout]        = 30
         b.headers['authorization'] = authorization_header if authorize?
       end
     end
@@ -83,7 +155,6 @@ module Strobe
       @reg_connection ||= Faraday::Connection.new(:url => @url) do |b|
         b.use Faraday::Adapter::NetHttp
         b.use Faraday::Response::ActiveSupportJson
-        b.options[:timeout]        = 30
         b.headers['authorization'] = authorization_header if authorize?
       end
     end

data/lib/strobe/resource/base.rb

@@ -146,21 +146,7 @@ module Strobe
 
       def save
         if valid?
-          root      = self.class.singular_resource_name
-          @response = self["id"] ? update : create
-
-          if @response.success?
-            merge! @response.body[root]
-            return true
-          elsif @response.status == 422
-            errors = @response.body['errors']
-            errors = errors[root] if errors
-            handle_errors(errors) if errors
-          else
-            raise "Something went wrong"
-          end
-
-          false
+          request { self["id"] ? update : create }
         end
       end
 
@@ -184,6 +170,24 @@ module Strobe
         uri
       end
 
+      def request
+        @response = yield
+        root      = self.class.singular_resource_name
+
+        if @response.success?
+          merge! @response.body[root]
+          return true
+        elsif @response.status == 422
+          errors = @response.body['errors']
+          errors = errors[root] if errors
+          handle_errors(errors) if errors
+        else
+          raise "Something went wrong"
+        end
+
+        false
+      end
+
       def request_params
         filter = self.class.filter
         { self.class.singular_resource_name => params.except(*filter) }

data/lib/strobe/resources/application.rb

@@ -1,3 +1,4 @@
+require 'digest/sha1'
 require 'mime/types'
 
 module Strobe
@@ -12,37 +13,45 @@ module Strobe
       filter :path
 
       validates "account", "name", "url", :presence => true
-      validates "path", :presence => true, :with => :ensure_sane_application_path,
-                        :skippable => false
 
-    private
+      def deploy!(path = nil)
+        self['path'] = path if path
 
-      def ensure_sane_application_path
-        if self[:path] && Dir["#{self[:path]}/**/*"].empty?
-          errors.add('path', 'is not a sane application directory')
+        validate_for_deploy or return
+
+        request do
+          packfile = build_packfile
+          connection.put("#{http_uri}/deploy", packfile.to_s, packfile.headers)
         end
       end
 
-      def create
-        multipart = build_multipart_request
-        connection.post http_uri, multipart.body, multipart.headers
+    private
+
+      def validate_for_deploy
+        errors.clear
+
+        validates_presence_of :path
+        ensure_sane_application_path
+
+        errors.empty?
       end
 
-      def update
-        multipart = build_multipart_request
-        connection.put http_uri, multipart.body, multipart.headers
+      def ensure_sane_application_path
+        if self[:path] && Dir["#{self[:path]}/**/*"].empty?
+          errors.add('path', 'is not a sane application directory')
+        end
       end
 
-      def build_multipart_request
+      def build_packfile
         Dir.chdir self[:path] do
-          Multipart.new request_params do |m|
+          PackFile.build 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, File.read(filename)
+              m.file filename, mime_type.to_s, read(filename)
             end
 
             picked_root_app = false
@@ -56,8 +65,8 @@ module Strobe
               next unless index && File.file?(index)
 
               manifest = "#{File.dirname(index)}/app.manifest"
-              manifest = File.read(manifest) if File.file?(manifest)
-              content  = File.read(index)
+              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
@@ -73,14 +82,19 @@ module Strobe
         end
       end
 
-      class Multipart
-        attr_reader :params
+      def read(path)
+        File.open(path, 'rb') { |f| f.read }
+      end
 
-        def initialize(params)
-          @params = params
-          @files  = []
+      class PackFile
+        def self.build
+          inst = new
+          yield inst
+          inst
+        end
 
-          yield self if block_given?
+        def initialize
+          @files = []
         end
 
         def file(path, content_type, body)
@@ -88,40 +102,20 @@ module Strobe
         end
 
         def headers
-          { "Content-Type" => %[multipart/form-data; boundary="#{boundary}"] }
+          { 'Content-Type' => 'application/x-strobe-deploy' }
         end
 
-        def body
-          b  = "--#{boundary}\r\n"
-          b << part("metadata", "application/json", metadata)
-          b << "--#{boundary}\r\n"
+        def to_s
+          head = ""
+          body = ""
 
-          @files.each do |path, type, body|
-            b << part("files[]", type, body)
-            b << "--#{boundary}\r\n"
+          @files.each do |path, type, data|
+            size = data.respond_to?(:bytesize) ? data.bytesize : data.size
+            head << "#{Digest::SHA1.hexdigest(data)} #{size} #{path} #{type}\n"
+            body << data
           end
 
-          b
-        end
-
-      private
-
-        def boundary
-          @boundary ||= ActiveSupport::SecureRandom.hex(25)
-        end
-
-        def metadata
-          params['application']['paths'] = @files.map { |parts| parts.first }
-          params.to_json
-        end
-
-        def part(name, type, body)
-          b = ""
-          b << %[Content-Disposition: form-data; name="#{name}"; filename="array"\r\n]
-          b << %[Content-Type: #{type}\r\n]
-          b << %[\r\n]
-          b << body
-          b << %[\r\n]
+          "#{head}\n#{body}"
         end
       end
     end

metadata

@@ -6,7 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 0
   - 2
-  version: 0.0.2
+  - 1
+  version: 0.0.2.1
 platform: ruby
 authors: 
 - Yehuda Katz
@@ -15,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-14 00:00:00 -08:00
+date: 2010-12-15 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -48,25 +49,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: faraday
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 5
-        - 0
-        version: 0.5.0
-  type: :runtime
-  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: highline
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -77,11 +63,11 @@ dependencies:
         - 0
         version: 1.6.0
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: thor
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -92,11 +78,11 @@ dependencies:
         - 0
         version: 0.14.0
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: mime-types
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -107,7 +93,7 @@ dependencies:
         - 0
         version: 1.16.0
   type: :runtime
-  version_requirements: *id006
+  version_requirements: *id005
 description: The client library for deploying applications to Strobe's HTML5 deployment platform
 email: 
 - wycats@strobecorp.com