shelltoad 0.2.2 → 0.2.4

data/Changelog.textile

@@ -0,0 +1,4 @@
+h3. 0.2.3
+
+* Add proper exit code on errors
+* Add code for pisimistic scenario for api calls

data/Rakefile

@@ -1,26 +1,21 @@
 require 'rubygems'
 require "bundler"
 Bundler.setup
+
 require 'rake'
 require 'rspec/core/rake_task'
+require 'jeweler'
 
 RSpec::Core::RakeTask.new(:spec) do |spec|
 end
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gemspec|
-    gemspec.name = "shelltoad"
-    gemspec.summary = "Command line interface for hoptoad (http://hoptoadapp.com)"
-    gemspec.description = <<-EOI
+Jeweler::Tasks.new do |gemspec|
+  gemspec.name = "shelltoad"
+  gemspec.summary = "Command line interface for hoptoad (http://hoptoadapp.com)"
+  gemspec.description = <<-EOI
 
-EOI
-    gemspec.email = "agresso@gmail.com"
-    gemspec.homepage = "http://github.com/railsware/shelltoad"
-    gemspec.authors = ["Bogdan Gusiev"]
-    gemspec.add_dependency "activeresource"
-    gemspec.executables = ["shelltoad"]
-  end
-rescue LoadError
-  puts "Jeweler not available. Install it with: [sudo] gem install jeweler"
+  EOI
+  gemspec.email = "agresso@gmail.com"
+  gemspec.homepage = "http://github.com/railsware/shelltoad"
+  gemspec.authors = ["Bogdan Gusiev"]
 end

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.4

data/bin/shelltoad

@@ -5,5 +5,5 @@ require "active_resource"
 require "shelltoad"
 
 
-Shelltoad.run(ARGV.shift, ARGV)
+exit Shelltoad.run(ARGV.shift, ARGV)
 

data/lib/shelltoad/command.rb

@@ -1,32 +1,39 @@
 class Shelltoad::Command
 
   def self.run(command, *args)
-    case command
+    case command.to_s
     when "errors", "ers", nil
       Shelltoad::Error.all.each do |error|
         output error.to_s
       end
     when "error", "er"
-      Shelltoad::Error.magic_find(args.shift) do |error|
+      magic_find(args.shift) do |error|
         output error.view
       end
     when "commit", "ci"
-      Shelltoad::Error.magic_find(args.shift) do |error|
+      magic_find(args.shift) do |error|
         output error.commit!
       end
     when "resolve", "rv" 
-      Shelltoad::Error.magic_find(args.shift) do |error|
+      magic_find(args.shift) do |error|
         error.resolve!
         output "Error #{error.id} marked as resolved"
       end
     when /^[\d]/
-      Shelltoad::Error.magic_find(command) do |error|
+      magic_find(command) do |error|
         output error.view
       end
+    else
+      raise Shelltoad::BaseException, "Command not found"
     end
-    return true
-  rescue Shelltoad::ErrorNotFound => e
+    return 0
+  rescue Shelltoad::BaseException => e
     output e.message
+    return 1
+  end
+
+  def self.magic_find(*args, &block)
+    Shelltoad::Error.magic_find(*args, &block)
   end
 
   def self.output(*args)

data/lib/shelltoad/error.rb

@@ -111,7 +111,12 @@ EOI
   def self.http_get(path, params = {})
     params[:auth_token] = ::Shelltoad::Configuration.key
     query = path + "?" + params.collect { |k,v| "#{k}=#{CGI::escape(v.to_s)}" }.join('&')
-    return Net::HTTP.get(URL.host, query)
+    @http ||= Net::HTTP.new(URL.host)
+    response = @http.get(query)
+    raise Shelltoad::ServiceNotAvailable.new(<<-EOI) unless response.is_a?(Net::HTTPSuccess)
+Hoptoad service not available. HTTP response:\n#{response.body}
+EOI
+    return response.body
   end
 
   def self.parse(string)

data/lib/shelltoad/exceptions.rb

@@ -1,11 +1,20 @@
-class Shelltoad::NoApiKey < StandardError
-end
+class Shelltoad
+  class BaseException < StandardError
+  end
 
-class Shelltoad::NoProject < StandardError
-end
+  class NoApiKey < BaseException
+  end
 
-class Shelltoad::NoConfigfile < StandardError
-end
+  class NoProject < BaseException
+  end
+
+  class NoConfigfile < BaseException
+  end
+
+  class ErrorNotFound < BaseException
+  end
+
+  class ServiceNotAvailable < BaseException
+  end
 
-class Shelltoad::ErrorNotFound < StandardError
 end

data/lib/shelltoad.rb

@@ -8,14 +8,14 @@ require "shelltoad/command"
 
 class Shelltoad
 
-  STDOUT = ::STDOUT
+  OUTPUT = ::STDOUT
 
   def self.run(*args)
     Command.run(*args)
   end
 
   def self.output(string)
-    ::Shelltoad::STDOUT << "#{string.to_s.strip}\n"
+    OUTPUT << "#{string.to_s.strip}\n"
   end
 
   def output(string)

data/shelltoad.gemspec

@@ -5,17 +5,18 @@
 
 Gem::Specification.new do |s|
   s.name = %q{shelltoad}
-  s.version = "0.2.1"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bogdan Gusiev"]
-  s.date = %q{2011-02-26}
+  s.date = %q{2011-04-04}
   s.default_executable = %q{shelltoad}
   s.description = %q{
 }
   s.email = %q{agresso@gmail.com}
   s.executables = ["shelltoad"]
   s.files = [
+    "Changelog.textile",
     "Gemfile",
     "Gemfile.lock",
     "Rakefile",
@@ -53,20 +54,17 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<activesupport>, [">= 0"])
       s.add_runtime_dependency(%q<i18n>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_runtime_dependency(%q<activeresource>, [">= 0"])
     else
       s.add_dependency(%q<rake>, [">= 0"])
       s.add_dependency(%q<activesupport>, [">= 0"])
       s.add_dependency(%q<i18n>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<activeresource>, [">= 0"])
     end
   else
     s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<activesupport>, [">= 0"])
     s.add_dependency(%q<i18n>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<activeresource>, [">= 0"])
   end
 end
 

data/spec/shelltoad_spec.rb

@@ -10,12 +10,30 @@ describe Shelltoad do
   end
 
   describe ".run" do
-    [["error", TEST_ERROR], "errors", "commit", TEST_ERROR, ["resolve", TEST_ERROR]].each do |command|
+    [["error", TEST_ERROR], "errors", ["commit", TEST_ERROR], ["resolve", TEST_ERROR]].each do |command|
       describe "command:#{command.inspect}" do
         subject { Shelltoad.run(*Array(command)) }
         it { should_not be_nil }
       end
     end
+
+    context "when hoptoad service is unavailable" do
+      before(:each) do
+        FakeWeb.register_uri(
+          :any, 
+          %r|http://startdatelabs.hoptoadapp.com/errors.xml|,
+          :body => "Service Unavailable. Try again later",
+          :status => 500
+        )
+        Shelltoad.run("errors")
+
+
+      end
+
+      it "should output the server error" do
+        TESTOUT.should =~ /^Hoptoad service not available./
+      end
+    end
   end
 
 end

data/spec/spec_helper.rb

@@ -8,27 +8,42 @@ require "fakeweb"
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__),'..','lib'))
 require "shelltoad"
 
+
 TEST_ERROR = 4040123
 
+TESTOUT = "" unless defined?(TESTOUT)
+
+Shelltoad.const_set("OUTPUT", TESTOUT)
+
 RSpec.configure do |config|
+  config.mock_with :mocha
+
+
+  config.before(:each) do
+    FakeWeb.allow_net_connect = false
+    FakeWeb.register_uri(
+      :any,
+      %r|http://startdatelabs.hoptoadapp.com/errors.xml|,
+      :body => File.new("spec/assets/errors.xml").read
+    )
+    FakeWeb.register_uri(
+      :any,
+      %r|http://startdatelabs.hoptoadapp.com/errors/#{TEST_ERROR}.xml|,
+      :body => File.new("spec/assets/error.xml").read
+    )
+    FakeWeb.register_uri(
+      :post,
+      "http://startdatelabs.hoptoadapp.com/errors/4040123" ,
+      :body => File.read('spec/assets/error.xml')
+    )
+
+  end
+
+  config.after(:each) do
+    FakeWeb.clean_registry
+    TESTOUT.gsub!(/.*\n*/, '')
+  end
+
 end
 
-FakeWeb.allow_net_connect = false
-FakeWeb.register_uri(
-  :any, 
-  %r|http://startdatelabs.hoptoadapp.com/errors.xml|,
-  :body => File.new("spec/assets/errors.xml").read
-)
-FakeWeb.register_uri(
-  :any, 
-  %r|http://startdatelabs.hoptoadapp.com/errors/#{TEST_ERROR}.xml|,
-  :body => File.new("spec/assets/error.xml").read
-)
-FakeWeb.register_uri(
-  :post,
-  "http://startdatelabs.hoptoadapp.com/errors/4040123" ,
-  :body => File.read('spec/assets/error.xml')
-)
-
-Shelltoad.const_set("STDOUT", "")
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: shelltoad
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Bogdan Gusiev
@@ -15,10 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-25 00:00:00 +02:00
+date: 2011-04-04 00:00:00 +03:00
 default_executable: shelltoad
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   name: rake
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -31,8 +32,8 @@ dependencies:
         version: "0"
   requirement: *id001
   type: :runtime
-  prerelease: false
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   name: activesupport
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -45,8 +46,8 @@ dependencies:
         version: "0"
   requirement: *id002
   type: :runtime
-  prerelease: false
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   name: i18n
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -59,8 +60,8 @@ dependencies:
         version: "0"
   requirement: *id003
   type: :runtime
-  prerelease: false
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   name: jeweler
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -73,21 +74,6 @@ dependencies:
         version: "0"
   requirement: *id004
   type: :development
-  prerelease: false
-- !ruby/object:Gem::Dependency 
-  name: activeresource
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id005
-  type: :runtime
-  prerelease: false
 description: |
   
 
@@ -99,6 +85,7 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- Changelog.textile
 - Gemfile
 - Gemfile.lock
 - Rakefile