shelltoad 0.2.5 → 0.3.0

data/Changelog.textile

@@ -1,3 +1,9 @@
+h3. 0.3.0
+
+* Support ssl in configuration
+* Support project id in configuration
+* Rework with hoptoad-api gem instead of ActiveSupport
+
 h3. 0.2.5
 
 * Bugfixes

data/Gemfile

@@ -1,11 +1,7 @@
 source :gemcutter
 
 gem "rake"
-gem 'activesupport'
-# We use some hash extensions - 
-# #from_xml and #with_indifferent_access from activesupport
-# By some unknown reason these extensions require i18n
-gem "i18n" 
+gem "hoptoad-api"
 
 group :development do
   gem 'jeweler'

data/Gemfile.lock

@@ -1,11 +1,16 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.0.5)
+    crack (0.1.8)
     diff-lcs (1.1.2)
     fakeweb (1.3.0)
     git (1.2.5)
-    i18n (0.5.0)
+    hashie (0.4.0)
+    hoptoad-api (2.3.0)
+      hashie (>= 0.2.0)
+      httparty (>= 0.5.2)
+    httparty (0.6.1)
+      crack (= 0.1.8)
     jeweler (1.5.2)
       bundler (~> 1.0.0)
       git (>= 1.2.5)
@@ -25,9 +30,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport
   fakeweb
-  i18n
+  hoptoad-api
   jeweler
   mocha
   rake

data/Readme.textile

@@ -6,8 +6,10 @@ h3. Configuration
 
 Create <pre><code>.shelltoadrc</code></pre> file in your project directory 
 with the application name and access key:
-<pre><code>project: myapp
-key: c285743ecbc285743ecbc285743ecbc285743ecb</code></pre> 
+<pre><code>account: myapp
+key: c285743ecbc285743ecbc285743ecbc285743ecb
+secure true # https usage. Default: false
+project_id: 123456 # see errors only under specified proejct. Default: all projects</code></pre> 
 
 h3. Commands
 

data/VERSION

@@ -1 +1 @@
-0.2.5
+0.3.0

data/lib/shelltoad/configuration.rb

@@ -1,12 +1,37 @@
 require "yaml"
+require "hoptoad-api"
 
 
 class Shelltoad::Configuration
 
+  #
+  # Class methods
+  #
+  
+  def self.key
+    self.instance.key
+  end
+
+  def self.project_id
+    self.instance.project_id
+  end
+  
+  def self.secure?
+    self.instance.secure
+  end
+
+  def self.account
+    self.instance.account
+  end
+
   def self.instance
     @instance ||= self.new
   end
 
+  #
+  # API
+  #
+  
   def initialize
     if File.exists?(".shelltoadrc")
       @config = YAML.load(File.new(".shelltoadrc"))
@@ -15,20 +40,23 @@ class Shelltoad::Configuration
     end
   end
 
-  def self.key
-    self.instance.key
+  def key
+    @config["key"] || raise(::Shelltoad::NoApiKey, "key option not specified in .shelltoadrc")
   end
 
-  def self.project
-    self.instance.project
+  def project_id
+    @config["project_id"]
   end
 
-  def key
-    @config && @config["key"] || raise(::Shelltoad::NoApiKey, "key option not specified in .shelltoadrc")
+  def account
+    (@config["account"] || @config["project"]) || raise(::Shelltoad::BaseException, "account option not specified in .shelltoadrc")
   end
 
-  def project
-    @config && @config["project"] || raise(::Shelltoad::NoProject, "project option not specified in .shelltoadrc")
+  def secure
+    @config["secure"] # false by default
   end
+
 end
   
+Hoptoad.auth_token = Shelltoad::Configuration.key
+Hoptoad.account = Shelltoad::Configuration.account

data/lib/shelltoad/error.rb

@@ -1,127 +1,126 @@
-require "active_support/core_ext/hash/conversions"
-require "active_support/core_ext/hash/indifferent_access"
-require "net/http"
 require "uri"
 require "cgi"
+require "hoptoad-api"
 
-class Shelltoad::Error
+class Shelltoad
+  class Error
 
-  URL = URI.parse("http://#{::Shelltoad::Configuration.project}.hoptoadapp.com")
+    URL = URI.parse("#{Configuration.secure? ? "https" : "http"}://#{Configuration.account}.hoptoadapp.com:80")
 
-  #
-  # Class methods
-  #
-  
-  def self.all(*args)
-    parse(http_get("/errors.xml"))[:groups].map! do |attributes|
-      self.new(attributes)
+    #
+    # Class methods
+    #
+
+    def self.all(options = {})
+      options[:project_id] ||= Configuration.project_id if Configuration.project_id
+      Hoptoad::Error.find(:all, options).map! do |attributes|
+        self.new(attributes)
+      end
     end
-  end
 
-  def self.magic_find(id)
-    error = self.all(:show_resolved => true).find do |error|
-      error.id.to_s =~ /#{id}$/
+    def self.magic_find(id)
+      error = id.to_s.size > 5 ? simple_finder(id) : magic_finder(id)
+      if block_given?
+        return yield(error)
+      end
+      error
     end
-    raise Shelltoad::ErrorNotFound, "Error with id:#{id} not found" unless error
-    if block_given?
-      yield(error)
+
+    def self.magic_finder(id)
+      1.upto(3) do |page|
+        self.all(:show_resolved => true, :page => page).each do |error|
+          return self.new(error) if error.id.to_s =~ /#{id}$/
+        end
+      end
+      raise ErrorNotFound, "Error with id like *#{id} not found among last 90 errors.\n Try input full id."
     end
-    error
-  end
 
-  #
-  # API
-  #
-  
-  def initialize(attributes)
-    @attributes = attributes
-  end
+    def self.simple_finder(id)
+      attributes = Hoptoad::Error.find(id) || raise(ErrorNotFound, "Error with id #{id} not found under this account.")
+      self.new(attributes, true)
+    end
 
-  def data
-    @data ||= self.class.parse(self.class.http_get(path('xml')))[:group]
-  end
+    #
+    # API
+    #
 
-  def view
-    <<-EOI
-#{data[:error_message]}
-#{data[:backtrace][:line].join("\n")}
-EOI
-  end
+    def initialize(attributes, full = false)
+      @attributes = attributes
+      @data = attributes if full
+    end
 
-  def commit!
-    message = <<-EOI.gsub(/`/, "'")
-    #{url}
+    def data
+      @data ||= Hoptoad::Error.find(self.id)
+    end
 
-    #{self.error_message}
-    EOI
-    output = `git commit -m "#{message}"`
-    if $?.success?
-      resolve!
+    def lines
+      self.data[:backtrace][:line]
     end
-    output
-  end
 
-  def resolve!
-    return true if self.resolved?
-    response = Net::HTTP.post_form(
-      url,
-      :"group[resolved]" => 1,
-      :format => "xml",
-      :_method => :put,
-      :auth_token => ::Shelltoad::Configuration.key
-    )
-    raise "HTTP error: #{response}" unless response.is_a?(Net::HTTPSuccess)
-    true
-  end
+    def view
+      <<-EOI
+      #{self.error_message}
+      #{self.lines.join("\n")}
+      EOI
+    end
 
+    def commit!
+      message = <<-EOI.gsub(/`/, "'")
+      #{url.to_s}
+
+      #{self.error_message}
+      EOI
+      output = `git commit -m "#{message}"`
+      if $?.success?
+        resolve!
+      end
+      output
+    end
 
-  def to_s
-    "[##{self.id}] #{self.rails_env.first} #{self.error_message} #{self.file}:#{self.line_number}"
-  end
+    def resolve!
+      return true if self.resolved?
+      Hoptoad::Error.put(path("xml"), :body => {:group => {:resolved => 1}})
+      true
+    end
 
-  def id
-    @attributes[:id]
-  end
 
-  def resolved?
-    @attributes[:resolved]
-  end
+    def to_s
+      "[##{self.id}] #{self.rails_env.first} #{self.error_message} #{self.file}:#{self.line_number}"
+    end
 
-  def method_missing(meth, *args, &blk)
-    if attr = @attributes[meth]
-      attr
-    else
-      super(meth, *args, &blk)
+    def id
+      @attributes[:id]
     end
-  end
 
-  #
-  # Implementation
-  #
-  
-  protected
-  def path(format = nil)
-    "/errors/#{self.id}" + (format ? ".#{format}" : "")
-  end
+    def resolved?
+      @attributes[:resolved]
+    end
 
-  def url(format = nil)
-    URI.parse(URL.to_s + path(format))
-  end
+    def [](key)
+      @attributes[key] || self.data[key]
+    end
 
-  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('&')
-    @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 method_missing(meth, *args, &blk)
+      if attr = @attributes[meth]
+        attr
+      else
+        super(meth, *args, &blk)
+      end
+    end
+
+    #
+    # Implementation
+    #
+
+    protected
+    def path(format = nil)
+      "/errors/#{self.id}" + (format ? ".#{format}" : "")
+    end
+
+    def url(format = nil)
+      URI.parse(URL.to_s + path(format))
+    end
 
-  def self.parse(string)
-    Hash.from_xml(string).with_indifferent_access
   end
 
 end
-

data/shelltoad.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{shelltoad}
-  s.version = "0.2.3"
+  s.version = "0.2.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bogdan Gusiev"]
-  s.date = %q{2011-04-04}
+  s.date = %q{2011-04-06}
   s.default_executable = %q{shelltoad}
   s.description = %q{
 }
@@ -51,19 +51,16 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rake>, [">= 0"])
-      s.add_runtime_dependency(%q<activesupport>, [">= 0"])
-      s.add_runtime_dependency(%q<i18n>, [">= 0"])
+      s.add_runtime_dependency(%q<hoptoad-api>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
     else
       s.add_dependency(%q<rake>, [">= 0"])
-      s.add_dependency(%q<activesupport>, [">= 0"])
-      s.add_dependency(%q<i18n>, [">= 0"])
+      s.add_dependency(%q<hoptoad-api>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 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<hoptoad-api>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
   end
 end

data/spec/assets/error.xml

@@ -8,7 +8,7 @@
   <resolved type="boolean">false</resolved> 
   <error-class>ActiveRecord::StatementInvalid</error-class> 
   <error-message>ActiveRecord::StatementInvalid: PGError: ERROR: duplicate key value violates unique constraint "index_companies_on_slug" : INSERT INTO "companies" ("slug", "created_at", "title", "updated_at", "external_url", "logo_id", "custom") VALUES('abbott-associates</error-message> 
-  <id type="integer">4023713</id> 
+  <id type="integer">4040123</id> 
   <lighthouse-ticket-id type="integer" nil="true"></lighthouse-ticket-id> 
   <controller>domU-12-31-39-15-22-AC:14720:critical,high,medium,low</controller> 
   <file>/var/data/www/apps/startwire/shared/bundle/ruby/1.8/gems/activerecord-2.3.8/lib/active_record/connection_adapters/abstract_adapter.rb</file> 

data/spec/shelltoad_spec.rb

@@ -5,7 +5,8 @@ describe Shelltoad do
 
   before(:each) do
     Shelltoad::Configuration.stubs(:key).returns("whatever")
-    Shelltoad::Configuration.stubs(:project).returns("startdatelabs")
+    Shelltoad::Configuration.stubs(:account).returns("startdatelabs")
+    Shelltoad::Configuration.stubs(:project_id).returns(14951)
     Shelltoad::Error.any_instance.stubs(:commit).returns(true)
   end
 
@@ -17,23 +18,6 @@ describe Shelltoad do
       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

@@ -32,8 +32,8 @@ RSpec.configure do |config|
       :body => File.new("spec/assets/error.xml").read
     )
     FakeWeb.register_uri(
-      :post,
-      "http://startdatelabs.hoptoadapp.com/errors/4040123" ,
+      :put,
+      "http://startdatelabs.hoptoadapp.com/errors/4040123.xml" ,
       :body => File.read('spec/assets/error.xml')
     )
 
@@ -47,3 +47,4 @@ RSpec.configure do |config|
 end
 
 
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: shelltoad
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 5
-  version: 0.2.5
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Bogdan Gusiev
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-04 00:00:00 +03:00
+date: 2011-04-06 00:00:00 +03:00
 default_executable: shelltoad
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -34,7 +34,7 @@ dependencies:
   type: :runtime
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: activesupport
+  name: hoptoad-api
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -48,7 +48,7 @@ dependencies:
   type: :runtime
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: i18n
+  name: jeweler
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -59,20 +59,6 @@ dependencies:
         - 0
         version: "0"
   requirement: *id003
-  type: :runtime
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  name: jeweler
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id004
   type: :development
 description: |