kronk 1.2.2 → 1.2.3

data/History.rdoc

@@ -1,3 +1,11 @@
+=== 1.2.3 / 2011-02-20
+
+* Bugfixes:
+
+  * Updated bash completion to display full URLs.
+
+  * Only URLs (not local file paths) are now written to the completion history.
+
 === 1.2.2 / 2011-02-19
 
 * Enhancements:

data/lib/kronk.rb

@@ -11,7 +11,7 @@ require 'yaml'
 class Kronk
 
   # This gem's version.
-  VERSION = '1.2.2'
+  VERSION = '1.2.3'
 
 
   ##
@@ -186,6 +186,8 @@ class Kronk
   # Returns cmd_opts Hash if none found.
 
   def self.merge_options_for_uri uri, cmd_opts={}
+    return cmd_opts if config[:no_uri_options]
+
     out_opts = Hash.new.merge cmd_opts
 
     config[:uri_options].each do |matcher, options|
@@ -297,15 +299,22 @@ class Kronk
 
 
   ##
-  # Writes the given URIs to the history file.
+  # Returns the Kronk history array of accessed URLs.
 
-  def self.save_history *uris
+  def self.history
     path = self.config[:history_file]
+    @history ||= File.read(path).split($/) if File.file?(path)
+    @history ||= []
+    @history
+  end
 
-    uris.concat File.readlines(path).map{|line| line.strip} if File.file?(path)
 
-    File.open path, "w" do |file|
-      file.write uris.uniq.join($/)
+  ##
+  # Writes the URL history to the history file.
+
+  def self.save_history
+    File.open self.config[:history_file], "w" do |file|
+      file.write self.history.uniq.join($/)
     end
   end
 
@@ -416,6 +425,7 @@ class Kronk
 
     at_exit do
       save_cookie_jar
+      save_history
     end
 
     options[:cache_response] = config[:cache_file] if config[:cache_file]
@@ -430,15 +440,12 @@ class Kronk
         $stdout << "Found #{diff.count} diff(s).\n"
       end
 
-      save_history uri1, uri2
       exit 1 if diff.count > 0
 
     else
       out = retrieve_data_string uri1, options
       out = Diff.insert_line_nums out if config[:show_lines]
       puts out
-
-      save_history uri1
     end
 
   rescue Request::NotFoundError, Response::MissingParser => e
@@ -571,6 +578,11 @@ Parse and run diffs against data from live and cached http responses.
       end
 
 
+      opt.on('--no-opts', 'Turn off config URI options') do
+        config[:no_uri_options] = true
+      end
+
+
       opt.on('--parser STR', String,
              'Override default parser') do |value|
         options[:parser] = value

data/lib/kronk/request.rb

@@ -47,15 +47,15 @@ class Kronk
     # :http_method:: Symbol - the http method to use; defaults to :get
     # :proxy:: Hash/String - http proxy to use; defaults to nil
 
-    def self.retrieve query, options={}
-      resp =
-        if IO === query || StringIO === query
-          retrieve_io query, options
-        elsif query == :cache || File.file?(query)
-          retrieve_file query, options
-        else
-          retrieve_uri query, options
-        end
+    def self.retrieve uri, options={}
+      if IO === uri || StringIO === uri
+        resp = retrieve_io uri, options
+      elsif uri == :cache || File.file?(uri)
+        resp = retrieve_file uri, options
+      else
+        resp = retrieve_uri uri, options
+        Kronk.history << uri
+      end
 
       begin
         File.open(options[:cache_response], "wb+") do |file|
@@ -67,7 +67,7 @@ class Kronk
 
       resp
     rescue SocketError, Errno::ENOENT, Errno::ECONNREFUSED
-      raise NotFoundError, "#{query} could not be found"
+      raise NotFoundError, "#{uri} could not be found"
     end
 
 
@@ -229,7 +229,7 @@ class Kronk
     # path and options.
 
     def self.build_uri uri, options={}
-      suffix = options.delete :uri_suffix
+      suffix = options[:uri_suffix]
 
       uri = "http://#{uri}"   unless uri =~ %r{^(\w+://|/)}
       uri = "#{uri}#{suffix}" if suffix

data/script/kronk_completion

@@ -1,22 +1,21 @@
 #!/bin/bash
 
+export COMP_WORDBREAKS=${COMP_WORDBREAKS/\:/}
+
 _kronk() 
 {
-  local cur prev opts kronk_keys
-  COMPREPLY=()
+  local cur kronk_keys
+
   cur="${COMP_WORDS[COMP_CWORD]}"
-  prev="${COMP_WORDS[COMP_CWORD-1]}"
 
   kronk_keys="$HOME/.kronk_history"
 
-
   if [ -f "$kronk_keys" ]; then
-    opts=$(cat $kronk_keys)
-    COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
+    COMPREPLY=( $(compgen -W "$(cat $kronk_keys)" -- ${cur}) )
     return 0
   fi
 
   return 1
 }
 
-complete -d -X '.[^./]*' -F _kronk kronk
+complete -o default -F _kronk kronk

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kronk
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 1
   - 2
-  - 2
-  version: 1.2.2
+  - 3
+  version: 1.2.3
 platform: ruby
 authors: 
 - Jeremie Castagna
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-21 00:00:00 -08:00
+date: 2011-02-22 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency