smog 0.0.2 → 0.0.3

data/Gemfile.lock

@@ -1,12 +1,13 @@
 PATH
   remote: .
   specs:
-    smog (0.0.1)
-      thor
+    smog (0.0.2)
+      main
 
 GEM
   remote: http://rubygems.org/
   specs:
+    arrayfields (4.7.4)
     aruba (0.2.3)
       background_process
       cucumber (~> 0.9.0)
@@ -19,22 +20,25 @@ GEM
       json (~> 1.4.6)
       term-ansicolor (~> 1.0.5)
     diff-lcs (1.1.2)
-    gherkin (2.2.8)
+    fattr (2.1.0)
+    gherkin (2.2.9)
       json (~> 1.4.6)
       term-ansicolor (~> 1.0.5)
     json (1.4.6)
-    rspec (2.0.0)
-      rspec-core (= 2.0.0)
-      rspec-expectations (= 2.0.0)
-      rspec-mocks (= 2.0.0)
-    rspec-core (2.0.0)
-    rspec-expectations (2.0.0)
+    main (4.2.0)
+      arrayfields (>= 4.7.4)
+      fattr (>= 2.1.0)
+    rspec (2.0.1)
+      rspec-core (~> 2.0.1)
+      rspec-expectations (~> 2.0.1)
+      rspec-mocks (~> 2.0.1)
+    rspec-core (2.0.1)
+    rspec-expectations (2.0.1)
       diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.0)
-      rspec-core (= 2.0.0)
-      rspec-expectations (= 2.0.0)
+    rspec-mocks (2.0.1)
+      rspec-core (~> 2.0.1)
+      rspec-expectations (~> 2.0.1)
     term-ansicolor (1.0.5)
-    thor (0.14.3)
 
 PLATFORMS
   ruby
@@ -42,6 +46,6 @@ PLATFORMS
 DEPENDENCIES
   aruba
   cucumber
+  main
   rspec
   smog!
-  thor

data/bin/smog

@@ -1,4 +1,2 @@
 #!/usr/bin/env ruby
-
 require 'smog/cli'
-Smog::CLI.start

data/features/smog.feature

@@ -1,28 +1,32 @@
-Feature: Food
-  In order to see test the CloudApp items API
+Feature: Smog
+  In order to test that an API respects 304s
   As a user
-  I want to see a lit of items
+  I want to query an API
 
   Scenario: Get items
-    When I run "smog curl --user test@example.com:pass"
-    Then the output should contain exactly:
+    When I run the command:
       """
-      curl -I --digest -u test@example.com:pass -H "Accept: application/json" "http://my.cloudapp.local/items?page=1&per_page=5"
-
+      smog auth=test@example.com:pass "http://my.cloudapp.local/items?page=1&per_page=5"
       """
+    #Then the output should be exactly:
+      #"""
+      #curl -I -s --digest -u test@example.com:pass -H "Accept: application/json" "http://my.cloudapp.local/items?page=1&per_page=5"
+          #HTTP/1.1 401 Authorization Required
+          #HTTP/1.1 200 OK
 
-  Scenario: Get items with etag
-    When I run "smog curl --etag abc123"
-    Then the output should contain exactly:
+      #curl -I -s --digest -u test@example.com:pass -H "Accept: application/json" -H "If-None-Match: \"c6b5d4a0589c53bf1d8326422fc33f57\"" -H "If-Modified-Since: Fri, 15 Oct 2010 14:46:14 GMT"
+          #HTTP/1.1 401 Authorization Required
+          #HTTP/1.1 304 Not Modified
+      #"""
+    Then the output should contain:
       """
-      curl -I -H "If-None-Match: \"abc123\"" -H "Accept: application/json" "http://my.cloudapp.local/items?page=1&per_page=5"
-
+      curl -I -s --digest -u test@example.com:pass -H "Accept: application/json" "http://my.cloudapp.local/items?page=1&per_page=5"
+          HTTP/1.1 401 Authorization Required
+          HTTP/1.1 200 OK
       """
-
-  Scenario: Get items with last-modified
-    When I run "smog curl --last-modified \"Tue, 05 Oct 2010 13:44:39 GMT\""
-    Then the output should contain exactly:
+    And the output should match:
       """
-      curl -I -H "If-Modified-Since: Tue, 05 Oct 2010 13:44:39 GMT" -H "Accept: application/json" "http://my.cloudapp.local/items?page=1&per_page=5"
-
+      curl -I -s --digest -u test@example.com:pass -H "Accept: application/json" -H "If-None-Match: \\"[^"]+\\"" -H "If-Modified-Since: [\w,: ]+" "http://my.cloudapp.local/items\?page=1&per_page=5"
+          HTTP/1.1 401 Authorization Required
+          HTTP/1.1 304 Not Modified
       """

data/features/step_definitions/command_steps.rb

@@ -0,0 +1,3 @@
+When /^I run the command:$/ do |command|
+  When "I run #{ command.inspect }"
+end

data/features/support/setup.rb

@@ -1 +1,2 @@
-require 'aruba'
+require 'bundler'
+Bundler.require(:default, :development)

data/lib/smog/cli.rb

@@ -1,8 +1,28 @@
-require 'thor'
-require 'smog'
+require 'main'
+
+Main do
+  version Smog::VERSION
+
+  argument 'url' do
+    description 'url to query'
+  end
+
+  keyword 'auth' do
+    required
+    description 'digest auth credentials'
+  end
+
+  def run
+    2.times do
+      command = build_curl
+
+      @last_response = %x(#{ command })
+      puts_response command, @last_response
+    end
+  end
+
+  private
 
-module Smog
-  class CLI < Thor
     # Basic curl command:
     # curl
     #   --digest -u "test@example.com:pass"
@@ -10,41 +30,50 @@ module Smog
     #   -H "If-None-Match: \"05122c59185e3bcf8b9a1976d46c2040\""
     #   -H "If-Modified-Since: Tue, 05 Oct 2010 13:44:39 GMT"
     #   "http://my.cloudapp.local/items?page=1&per_page=5"
+    def build_curl
+      [ 'curl -I -s',
+        "--digest -u #{ params[:auth].value }",
+        header('Accept', 'application/json')
+      ].tap do |command|
+        if etag
+          command << header('If-None-Match', %{\\"#{ etag }\\"})
+        end
 
-    desc 'curl', 'Prints the curl command to fetch items'
-    method_option :user,          :aliases => '-u'
-    method_option :etag,          :aliases => '-e'
-    method_option :last_modified, :aliases => '-l'
-    def curl
-      print build_command(options)
+        if last_modified
+          command << header('If-Modified-Since', last_modified)
+        end
+
+        command << params[:url].value.inspect
+      end.join ' '
     end
 
-    private
+    def header(name, value)
+      %{-H "#{ name }: #{ value }"}
+    end
 
-      def build_command(options)
-        [ 'curl -I' ].tap do |command|
-          command << "--digest -u #{ options[:user] }" if options[:user]
+    def etag
+      response_header /ETag: "(.*)"/
+    end
 
-          if options[:etag]
-            command << header('If-None-Match', %{\\"#{ options[:etag] }\\"})
-          end
+    def last_modified
+      response_header /Last-Modified: (.*)/
+    end
 
-          if options[:last_modified]
-            command << header('If-Modified-Since', options[:last_modified])
-          end
+    def response_header(match_header)
+      return unless @last_response
 
-          command << header('Accept', 'application/json')
-          command << "#{ url }\n"
-        end.join ' '
-      end
+      @last_response.match(match_header)[1].chomp
+    end
 
-      def header(name, value)
-        %{-H "#{ name }: #{ value }"}
-      end
+    def puts_response(command, full_response)
+      puts command
 
-      def url
-        '"http://my.cloudapp.local/items?page=1&per_page=5"'
+      full_response.split("\r\n\r\n").each do |response|
+        status = response.split("\r\n").first
+        puts "    #{ status }"
       end
 
-  end
+      puts
+    end
+
 end

data/lib/smog/version.rb

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

data/smog.gemspec

@@ -12,17 +12,14 @@ Gem::Specification.new do |s|
   s.summary     = %q{Test the CloudApp API from the command line}
   s.description = %q{Smog simply outputs a curl command to use to test the CloudApp API}
 
-  s.required_rubygems_version = ">= 1.3.6"
-
-  s.add_dependency "thor"
+  s.add_dependency "main"
 
   s.add_development_dependency "rspec"
   s.add_development_dependency "cucumber"
   s.add_development_dependency "aruba"
 
-  s.files              = `git ls-files`.split("\n")
-  s.test_files         = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables        = %w(smog)
-  s.default_executable = "smog"
-  s.require_paths      = ["lib"]
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: smog
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Larry Marburger
@@ -15,11 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-11 00:00:00 -04:00
-default_executable: smog
+date: 2010-10-21 00:00:00 -04:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: thor
+  name: main
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -90,6 +90,7 @@ files:
 - Rakefile
 - bin/smog
 - features/smog.feature
+- features/step_definitions/command_steps.rb
 - features/support/setup.rb
 - lib/smog.rb
 - lib/smog/cli.rb
@@ -118,12 +119,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 23
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 6
-      version: 1.3.6
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: 
@@ -133,4 +132,5 @@ specification_version: 3
 summary: Test the CloudApp API from the command line
 test_files: 
 - features/smog.feature
+- features/step_definitions/command_steps.rb
 - features/support/setup.rb