shelltoad 0.2.0 → 0.2.2

data/Gemfile

@@ -1,8 +1,15 @@
 source :gemcutter
 
-gem 'activeresource'
-gem 'jeweler'
 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" 
+
+group :development do
+  gem 'jeweler'
+end
 
 group :test do
   gem 'rspec'

data/Gemfile.lock

@@ -1,34 +1,33 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activeresource (2.3.8)
-      activesupport (= 2.3.8)
-    activesupport (2.3.8)
+    activesupport (3.0.5)
     diff-lcs (1.1.2)
     fakeweb (1.3.0)
     git (1.2.5)
+    i18n (0.5.0)
     jeweler (1.5.2)
       bundler (~> 1.0.0)
       git (>= 1.2.5)
       rake
-    mocha (0.9.10)
-      rake
+    mocha (0.9.12)
     rake (0.8.7)
-    rspec (2.4.0)
-      rspec-core (~> 2.4.0)
-      rspec-expectations (~> 2.4.0)
-      rspec-mocks (~> 2.4.0)
-    rspec-core (2.4.0)
-    rspec-expectations (2.4.0)
+    rspec (2.5.0)
+      rspec-core (~> 2.5.0)
+      rspec-expectations (~> 2.5.0)
+      rspec-mocks (~> 2.5.0)
+    rspec-core (2.5.1)
+    rspec-expectations (2.5.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.4.0)
+    rspec-mocks (2.5.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activeresource
+  activesupport
   fakeweb
+  i18n
   jeweler
   mocha
   rake

data/Rakefile

@@ -1,10 +1,10 @@
 require 'rubygems'
+require "bundler"
+Bundler.setup
 require 'rake'
-require 'spec/rake/spectask'
+require 'rspec/core/rake_task'
 
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
+RSpec::Core::RakeTask.new(:spec) do |spec|
 end
 
 begin

data/Readme.textile

@@ -9,6 +9,16 @@ with the application name and access key:
 <pre><code>project: myapp
 key: c285743ecbc285743ecbc285743ecbc285743ecb</code></pre> 
 
+h3. Commands
+
+* errors, ers - list all unresolved errors, this is the default
+* error, er [number] - display information about given error. Shortcut: shelltoad [number]
+* resolve, rv [number] - mark error as resolved in Hoptoad
+* commit, ci [number] - do commit to vcs with the information on the specified error and mark error resolved in Hoptoad
+
+Shelltoad supports 'magicfind' in all commands: 
+You don't need to type whole error id - just last three numbers is enough.
+
 h3. Usage
 
 <pre><code>$ shelltoad 
@@ -29,5 +39,9 @@ ActiveRecord::StatementInvalid: PGError: ERROR: duplicate key value violates uni
 
 
 # Do changes you want
-$ shelltoad commit 713</code></pre>
+$ git add .
+#only git is supported right now
+$ shelltoad commit 713 
+[dev 47f09ec]     http://xxx.hoptoadapp.com//errors/4023713
+ 1 files changed, 1 insertions(+), 1 deletions(-)</code></pre>
 

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.2

data/lib/shelltoad/command.rb

@@ -3,22 +3,33 @@ class Shelltoad::Command
   def self.run(command, *args)
     case command
     when "errors", "ers", nil
-      Shelltoad::Error.find(:all).each do |error|
-        unless error.rails_env == "development"
-          Shelltoad.output error.to_s
-        end
+      Shelltoad::Error.all.each do |error|
+        output error.to_s
       end
     when "error", "er"
-      Shelltoad.output Shelltoad::Error.magic_find(args.shift).view || "Not found"
+      Shelltoad::Error.magic_find(args.shift) do |error|
+        output error.view
+      end
     when "commit", "ci"
-      if error = Shelltoad::Error.magic_find(args.shift)
-        error.commit
-      else
-        Shelltoad.output "Not Found"
+      Shelltoad::Error.magic_find(args.shift) do |error|
+        output error.commit!
+      end
+    when "resolve", "rv" 
+      Shelltoad::Error.magic_find(args.shift) do |error|
+        error.resolve!
+        output "Error #{error.id} marked as resolved"
       end
     when /^[\d]/
-      Shelltoad.output Shelltoad::Error.magic_find(command).view || "Not found"
+      Shelltoad::Error.magic_find(command) do |error|
+        output error.view
+      end
     end
     return true
+  rescue Shelltoad::ErrorNotFound => e
+    output e.message
+  end
+
+  def self.output(*args)
+    Shelltoad.output(*args)
   end
 end

data/lib/shelltoad/error.rb

@@ -1,42 +1,46 @@
-require "active_resource"
+require "active_support/core_ext/hash/conversions"
+require "active_support/core_ext/hash/indifferent_access"
 require "net/http"
 require "uri"
 require "cgi"
 
-class Shelltoad::Error < ActiveResource::Base
-  URL = URI.parse("http://#{::Shelltoad::Configuration.project}.hoptoadapp.com")
-  self.site = URL.to_s
-
-  class << self
-    @@auth_token = ::Shelltoad::Configuration.key
-
-    def find(*arguments)
-      arguments = append_auth_token_to_params(*arguments)
-      super(*arguments)
-    end
+class Shelltoad::Error
 
-    def append_auth_token_to_params(*arguments)
-      opts = arguments.last.is_a?(Hash) ? arguments.pop : {}
-      opts = opts.has_key?(:params) ? opts : opts.merge(:params => {})
-      opts[:params] = opts[:params].merge(:auth_token => @@auth_token)
-      arguments << opts
-      arguments
-    end
-  end
+  URL = URI.parse("http://#{::Shelltoad::Configuration.project}.hoptoadapp.com")
 
+  #
+  # Class methods
+  #
+  
   def self.all(*args)
-    self.find :all, *args
+    parse(http_get("/errors.xml"))[:groups].map! do |attributes|
+      self.new(attributes)
+    end
   end
 
   def self.magic_find(id)
-    self.all(:params => {:show_resolved => true}).find do |error|
+    error = self.all(:show_resolved => true).find do |error|
       error.id.to_s =~ /#{id}$/
     end
+    raise Shelltoad::ErrorNotFound, "Error with id:#{id} not found" unless error
+    if block_given?
+      yield(error)
+    end
+    error
+  end
+
+  #
+  # API
+  #
+  
+  def initialize(attributes)
+    @attributes = attributes
   end
 
   def data
-    @data ||= Hash.from_xml(http_get("/errors/#{self.id}.xml", :auth_token => ::Shelltoad::Configuration.key)).with_indifferent_access[:group]
+    @data ||= self.class.parse(self.class.http_get(path('xml')))[:group]
   end
+
   def view
     <<-EOI
 #{data[:error_message]}
@@ -44,24 +48,75 @@ class Shelltoad::Error < ActiveResource::Base
 EOI
   end
 
-  def commit
+  def commit!
     message = <<-EOI.gsub(/`/, "'")
-    #{self.class.site}/errors/#{self.id}
+    #{url}
 
     #{self.error_message}
     EOI
-    Shelltoad.output `git commit -m "#{message}"`
+    output = `git commit -m "#{message}"`
+    if $?.success?
+      resolve!
+    end
+    output
   end
 
-  def http_get(path, params = {})
-    query = path + "?" + params.collect { |k,v| "#{k}=#{CGI::escape(v.to_s)}" }.join('&')
-    return Net::HTTP.get(URL.host, query)
+  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 to_s
     "[##{self.id}] #{self.rails_env.first} #{self.error_message} #{self.file}:#{self.line_number}"
   end
 
+  def id
+    @attributes[:id]
+  end
+
+  def resolved?
+    @attributes[:resolved]
+  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.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)
+  end
+
+  def self.parse(string)
+    Hash.from_xml(string).with_indifferent_access
+  end
 
 end
 

data/lib/shelltoad/exceptions.rb

@@ -6,3 +6,6 @@ end
 
 class Shelltoad::NoConfigfile < StandardError
 end
+
+class Shelltoad::ErrorNotFound < StandardError
+end

data/lib/shelltoad.rb

@@ -15,7 +15,7 @@ class Shelltoad
   end
 
   def self.output(string)
-    ::Shelltoad::STDOUT << "#{string}\n"
+    ::Shelltoad::STDOUT << "#{string.to_s.strip}\n"
   end
 
   def output(string)

data/shelltoad.gemspec

@@ -5,40 +5,67 @@
 
 Gem::Specification.new do |s|
   s.name = %q{shelltoad}
-  s.version = "0.1.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bogdan Gusiev"]
-  s.date = %q{2011-01-20}
+  s.date = %q{2011-02-26}
   s.default_executable = %q{shelltoad}
   s.description = %q{
 }
   s.email = %q{agresso@gmail.com}
   s.executables = ["shelltoad"]
+  s.files = [
+    "Gemfile",
+    "Gemfile.lock",
+    "Rakefile",
+    "Readme.textile",
+    "VERSION",
+    "bin/shelltoad",
+    "lib/shelltoad.rb",
+    "lib/shelltoad/command.rb",
+    "lib/shelltoad/configuration.rb",
+    "lib/shelltoad/error.rb",
+    "lib/shelltoad/exceptions.rb",
+    "shelltoad.gemspec",
+    "spec/assets/error.xml",
+    "spec/assets/errors.xml",
+    "spec/shelltoad/error_spec.rb",
+    "spec/shelltoad_spec.rb",
+    "spec/spec_helper.rb"
+  ]
   s.homepage = %q{http://github.com/railsware/shelltoad}
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Command line interface for hoptoad (http://hoptoadapp.com)}
+  s.test_files = [
+    "spec/shelltoad/error_spec.rb",
+    "spec/shelltoad_spec.rb",
+    "spec/spec_helper.rb"
+  ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activeresource>, [">= 0"])
-      s.add_runtime_dependency(%q<jeweler>, [">= 0"])
       s.add_runtime_dependency(%q<rake>, [">= 0"])
+      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<activeresource>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
       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<activeresource>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
     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/error_spec.rb

@@ -2,8 +2,19 @@ require 'spec_helper'
 
 describe Shelltoad::Error do
 
-  it "should view issue" do
-    Shelltoad.output(Shelltoad::Error.magic_find(TEST_ERROR).view)
+  subject { Shelltoad::Error.magic_find(TEST_ERROR % 1000) }
+
+  its(:view) { should_not be_empty }
+
+  describe ".all" do
+    it "should return the list of errors" do
+      described_class.all.should_not be_empty
+    end
   end
+
+  its(:resolve!) { should be_true}
+
+  its(:url) {should == URI.parse("http://startdatelabs.hoptoadapp.com/errors/#{TEST_ERROR}")}
+
   
 end

data/spec/shelltoad_spec.rb

@@ -10,7 +10,7 @@ describe Shelltoad do
   end
 
   describe ".run" do
-    [["error", TEST_ERROR], "errors", "commit", 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 }

data/spec/spec_helper.rb

@@ -1,16 +1,16 @@
 require 'rubygems'
+require "bundler"
+Bundler.setup
 require "net/http"
-require 'spec'
-require 'spec/autorun'
+require 'rspec'
 require "mocha"
-require 'active_record'
 require "fakeweb"
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__),'..','lib'))
 require "shelltoad"
 
 TEST_ERROR = 4040123
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
 end
 
 FakeWeb.allow_net_connect = false
@@ -24,40 +24,11 @@ FakeWeb.register_uri(
   %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", "")
 
-
-
-class Net::HTTP
-
-  alias_method :request_without_log,  :request
-
-  def request(request, body = nil, &block)
-    url = "http#{"s" if self.use_ssl?}://#{self.address}:#{self.port}#{request.path}"
-    rails_log("HTTP #{request.method}", url)
-    rails_log("POST params", request.body) if request.is_a?(::Net::HTTP::Post)
-    res = request_without_log(request, body, &block)
-    rails_log("Response body", res.body) if res
-    res
-  end
-
-  def rails_log(message, dump)
-    if started? && defined?(Rails)
-      Rails.logger.debug(format_log_entry(message, dump))
-    end
-  end
-
-  def format_log_entry(message, dump = nil)
-    if ActiveRecord::Base.colorize_logging
-      message_color, dump_color = "4;32;1", "0;1"
-      log_entry = "  \e[#{message_color}m#{message}\e[0m   "
-      log_entry << "\e[#{dump_color}m%#{String === dump ? 's' : 'p'}\e[0m" % dump if dump
-      log_entry
-    else
-      "%s  %s" % [message, dump]
-    end
-  end
-
-end
-

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: shelltoad
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Bogdan Gusiev
@@ -15,12 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-23 00:00:00 +02:00
+date: 2011-03-25 00:00:00 +02:00
 default_executable: shelltoad
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  name: activeresource
+  name: rake
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -32,9 +31,9 @@ dependencies:
         version: "0"
   requirement: *id001
   type: :runtime
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  name: jeweler
+- !ruby/object:Gem::Dependency 
+  name: activesupport
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -46,9 +45,9 @@ dependencies:
         version: "0"
   requirement: *id002
   type: :runtime
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  name: rake
+- !ruby/object:Gem::Dependency 
+  name: i18n
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -60,9 +59,9 @@ dependencies:
         version: "0"
   requirement: *id003
   type: :runtime
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  name: activeresource
+- !ruby/object:Gem::Dependency 
+  name: jeweler
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -73,7 +72,22 @@ dependencies:
         - 0
         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: |