shelltoad 0.3.1 → 0.4.1

data/Changelog.textile

@@ -1,3 +1,12 @@
+h3. 0.4.1
+
+* "help" command
+
+h3. 0.4.0
+
+* Interactive menu for error select support
+* _open_ command to open error page in browser
+
 h3. 0.3.1
 
 * Bugfix configuration

data/Readme.textile

@@ -8,8 +8,9 @@ Create <pre><code>.shelltoadrc</code></pre> file in your project directory
 with the application name and access key:
 <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> 
+secure: true # https usage. Default: false.
+project_id: 123456 # see errors only under specified proejct. Default: all projects.
+browser: firefox # specify browsers for open errors. Default: sensible-browser or firefox or _etc_ or explorer.</code></pre> 
 
 h3. Commands
 
@@ -17,9 +18,11 @@ h3. Commands
 * 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
+* open, op [number] - open error page in browser
 
 Shelltoad supports 'magicfind' in all commands: 
 You don't need to type whole error id - just last three numbers is enough.
+Also all error-related commands support interactive menu if number is not specified.
 
 h3. Usage
 

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.4.1

data/lib/shelltoad/command.rb

@@ -1,42 +1,88 @@
-class Shelltoad::Command
+require "readline"
+class Shelltoad
+  class Command
 
-  def self.run(command, *args)
-    case command.to_s
-    when "errors", "ers", nil, ""
-      Shelltoad::Error.all.each do |error|
-        output error.to_s
-      end
-    when "error", "er"
-      magic_find(args.shift) do |error|
-        output error.view
+    class << self
+
+      #
+      # API
+      #
+      
+      def run(command, *args)
+        case command.to_s
+        when "-h", "--help", "help", "h"
+          display_help
+        when "errors", "ers", nil, ""
+          Error.all.each do |error|
+            output error.to_s
+          end
+        when "error", "er"
+          magic_find(args.shift) do |error|
+            output error.view
+          end
+        when "commit", "ci"
+          commit(args.shift)
+        when "resolve", "rv"
+          magic_find(args.shift) do |error|
+            error.resolve!
+            output "Error #{error.id} marked as resolved"
+          end
+        when "open", "op"
+          magic_find(args.shift) do |error|
+            open error.url
+          end
+        when /^[\d]/
+          magic_find(command) do |error|
+            output error.view
+          end
+        else
+          raise BaseException, "Command not found"
+        end
+        return 0
+      rescue BaseException => e
+        output e.message
+        return 1
       end
-    when "commit", "ci"
-      magic_find(args.shift) do |error|
-        output error.commit!
+
+      #
+      # Implementation
+      #
+      
+      protected
+      def magic_find(*args, &block)
+        Error.magic_find(*args, &block)
       end
-    when "resolve", "rv" 
-      magic_find(args.shift) do |error|
-        error.resolve!
-        output "Error #{error.id} marked as resolved"
+
+      def output(*args)
+        Shelltoad.output(*args)
       end
-    when /^[\d]/
-      magic_find(command) do |error|
-        output error.view
+
+      def commit(id)
+        magic_find(id) do |error|
+          output error.commit!
+        end
+      end # commit(id, args)
+
+      def open(url)
+        [Configuration.browser, "firefox", "chromium-browser", "start" ].find do |browser|
+          system browser, url.to_s
+        end
       end
-    else
-      raise Shelltoad::BaseException, "Command not found"
-    end
-    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 display_help
+        output <<-EOI
+Usage: shelltoad command [<args>]
+
+Available commands:
 
-  def self.output(*args)
-    Shelltoad.output(*args)
+    errors   list all unresolved errors, this is the default
+    error    display information about given error. Shortcut: shelltoad <number>
+    resolve  mark error as resolved in Hoptoad
+    commit   do commit to vcs with the information on the specified error and mark error resolved in Hoptoad
+    open     open error page in browser
+EOI
+
+      end
+    end
   end
 end

data/lib/shelltoad/configuration.rb

@@ -24,6 +24,10 @@ class Shelltoad::Configuration
     self.instance.account
   end
 
+  def self.browser
+    self.instance.browser
+  end
+
   def self.instance
     @instance ||= self.new
   end
@@ -56,6 +60,10 @@ class Shelltoad::Configuration
     @config["secure"] # false by default
   end
 
+  def browser
+    @config["browser"] || "sensible-browser"
+  end
+
 end
   
 Hoptoad.auth_token = Shelltoad::Configuration.key

data/lib/shelltoad/error.rb

@@ -7,18 +7,30 @@ class Shelltoad
 
     URL = URI.parse("#{Configuration.secure? ? "https" : "http"}://#{Configuration.account}.hoptoadapp.com:80")
 
+    CACHE = {} # Runtime cache for http queries
+
     #
     # 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
+      CACHE[options] ||= (
+        (Hoptoad::Error.find(:all, options) || []).map! do |attributes|
+          self.new(attributes)
+        end
+      )
     end
 
     def self.magic_find(id)
+      if !id || id.to_s.empty?
+        Error.all.each do |error|
+          output error.to_s
+        end
+        output "\n"
+        id = Readline.readline("Input error id: ", true)
+      end
+
       error = id.to_s.size > 5 ? simple_finder(id) : magic_finder(id)
       if block_given?
         return yield(error)
@@ -40,6 +52,10 @@ class Shelltoad
       self.new(attributes, true)
     end
 
+    def self.output(*args)
+      Shelltoad.output(*args)
+    end
+
     #
     # API
     #
@@ -59,6 +75,7 @@ class Shelltoad
 
     def view
       <<-EOI
+      #{self.url.to_s}
       #{self.error_message}
       #{self.lines.join("\n")}
       EOI
@@ -100,14 +117,12 @@ class Shelltoad
       @attributes[key] || self.data[key]
     end
 
-    def method_missing(meth, *args, &blk)
-      if attr = @attributes[meth]
-        attr
-      else
-        super(meth, *args, &blk)
-      end
+    def url(format = nil)
+      URI.parse(URL.to_s + path(format))
     end
 
+
+
     #
     # Implementation
     #
@@ -117,8 +132,12 @@ class Shelltoad
       "/errors/#{self.id}" + (format ? ".#{format}" : "")
     end
 
-    def url(format = nil)
-      URI.parse(URL.to_s + path(format))
+    def method_missing(meth, *args, &blk)
+      if attr = @attributes[meth]
+        attr
+      else
+        super(meth, *args, &blk)
+      end
     end
 
   end

data/shelltoad.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{shelltoad}
-  s.version = "0.3.1"
+  s.version = "0.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bogdan Gusiev"]
-  s.date = %q{2011-04-06}
+  s.date = %q{2011-04-14}
   s.default_executable = %q{shelltoad}
   s.description = %q{
 }

data/spec/shelltoad_spec.rb

@@ -11,13 +11,30 @@ describe Shelltoad do
   end
 
   describe ".run" do
+    subject { Shelltoad.run(*args) }
+
+
     [["error", TEST_ERROR], "errors", ["commit", TEST_ERROR], ["resolve", TEST_ERROR]].each do |command|
       describe "command:#{command.inspect}" do
-        subject { Shelltoad.run(*Array(command)) }
+        let(:args) {  Array(command) }
         it { should == 0 }
       end
     end
 
+
+    describe "open command" do
+      let(:args) { ["open", TEST_ERROR] }
+      before(:each) do
+        Shelltoad::Configuration.stubs(:browser).returns("true")
+      end
+      it {should  == 0}
+      
+    end
+
+    describe "help commad" do
+      let(:args) { "help" }
+      it {should == 0}
+    end
   end
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: shelltoad
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 13
   prerelease: false
   segments: 
   - 0
-  - 3
+  - 4
   - 1
-  version: 0.3.1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Bogdan Gusiev
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-06 00:00:00 +03:00
+date: 2011-04-14 00:00:00 +03:00
 default_executable: shelltoad
 dependencies: 
 - !ruby/object:Gem::Dependency