shakedown 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ebfcbbf3ca9f9b6189b8cc74fd49dba588a64326
-  data.tar.gz: e6d6cf59453bf5b279f18f7fae8b019f3be992de
+  metadata.gz: 6df497238568876a2b7b9cfe578d2b71e9e92240
+  data.tar.gz: 8c2cd6b461dcd8a00f7bd777d017518d823fc6fb
 SHA512:
-  metadata.gz: f8b8ec20c4e3a0621e1f4c3763b9037fcc0111077b90d29c25d451fda338d13a96b9075a54acf9ee1511d002ec25571a356c489a6fe587e71f33b8700298781d
-  data.tar.gz: b912947cc9709b294e8f910cf8ce0547b1678a67f4f5f9ef74f8c162496ba5b488a6e3ea930556878e5e479eb4989aef363a044be07d5548ba91a5a97934cd45
+  metadata.gz: dc7673e132a8582292797bfe0087f627a890281d71a4b93d517fd9993ba99ea55f3d2f8a013cb5f3c67f1e6b4cbfc0747112b21d021a67490355e7598332b3a2
+  data.tar.gz: 2a720b8f9bad95fd15ac997a6dd071027cc7fdda3104a562a1684da90d561e32b54b07f2a86c8ea461d55131e8783669e897bf0e7deabf92b290602a4021e983

data/lib/shakedown.rb

@@ -1,7 +1,7 @@
 require "net/http"
 require "uri"
 require "json"
-require "formatador"
+require "colored"
 
 require_relative "./shakedown/version"
 require_relative "./shakedown/configuration"

data/lib/shakedown/runner.rb

@@ -30,13 +30,13 @@ module Shakedown
     end
 
     def print_status(status, update=false)
-      message = "[#{COLORS[status]}]#{SYMBOLS[status]} #{type.to_s.upcase.ljust(8)} #{url}[/]"
+      message = " #{SYMBOLS[status]} #{type.to_s.upcase.ljust(7)} #{url}".send(COLORS[status])
 
       if update
-        Formatador.redisplay(message)
-        puts
+        puts message
       else
-        Formatador.display(message)
+        print message + "\r"
+        $stdout.flush
       end
     end
 

data/lib/shakedown/sequence.rb

@@ -19,16 +19,113 @@ module Shakedown
       [base_url, url].join
     end
 
-    def get(url, params={}, &assertions)
-      Runner.new(:get, url_for(url), params).run.assert(assertions)
+    def get(url, params={}, &assertion)
+      request = Request.new(:get, url_for(url), params)
+      assert(request, assertion)
     end
 
-    def post(url, params={}, &assertions)
-      Runner.new(:post, url_for(url), params).run.assert(assertions)
+    def post(url, params={}, &assertion)
+      request = Request.new(:post, url_for(url), params)
+      assert(request, assertion)
     end
 
-    def delete(url, params={}, &assertions)
-      Runner.new(:delete, url_for(url), params).run.assert(assertions)
+    def delete(url, params={}, &assertion)
+      request = Request.new(:delete, url_for(url), params)
+      assert(request, assertion)
+    end
+
+    def assert(request, callable)
+      assertion = Assertion.new(callable)
+
+      if assertion.status != request.status
+        puts " ✖ #{request.type.to_s.upcase.ljust(7)} #{request.url}".red
+        puts
+        puts "Expected: #{assertion.status}"
+        puts "  Actual: #{request.status}"
+        puts
+        exit
+      end
+
+      if assertion.body != request.body
+        puts " ✖ #{request.type.to_s.upcase.ljust(7)} #{request.url}".red
+        puts
+        puts "Expected: #{assertion.body}"
+        puts "  Actual: #{request.body}"
+        puts
+        exit
+      end
+
+      puts " ✔ #{request.type.to_s.upcase.ljust(7)} #{request.url}".green
+    end
+  end
+
+  class Assertion
+    class Null
+      def self.==(other)
+        true
+      end
+      def self.!=(other)
+        false
+      end
+    end
+
+    attr_reader :status, :body
+
+    def initialize(callable)
+      @status = Null
+      @body = Null
+      unless callable.nil?
+        @body = JSON.parse(instance_eval(&callable).to_json)
+      end
+    end
+
+    def status(code=nil)
+      @status = code unless code.nil?
+      @status
+    end
+  end
+
+  class Request
+    attr_reader :type, :url, :params
+
+    def initialize(type, url, params={})
+      @type   = type
+      @url    = url
+      @params = params
+    end
+
+    def body
+      @body ||= JSON.parse(response.body)
+    end
+
+    def status
+      @status ||= response.code.to_i
+    end
+
+    def uri
+      URI.parse(url)
+    end
+
+    def http
+      Net::HTTP.new(uri.host, uri.port)
+    end
+
+    def response
+      @response ||= http.request(request)
+    end
+
+    def request
+      case type
+      when :get
+        request = Net::HTTP::Get.new(uri.request_uri)
+      when :post
+        request = Net::HTTP::Post.new(uri.request_uri)
+      when :delete
+        request = Net::HTTP::Delete.new(uri.request_uri)
+      end
+
+      request.set_form_data(params)
+      request
     end
   end
 end

data/lib/shakedown/version.rb

@@ -1,3 +1,3 @@
 module Shakedown
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/shakedown.gemspec

@@ -20,6 +20,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_dependency "formatador", "~> 0.2.5"
+  spec.add_dependency "colored", "~> 1.2"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shakedown
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Casey O'Hara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-08 00:00:00.000000000 Z
+date: 2015-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: formatador
+  name: colored
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: '1.2'
 description: ''
 email:
 - casey@camber.io