itinerary 0.1 → 0.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjBmNTg1NjNhMTkzNDVmODJhZDBmYTJmODI0YzNmN2E1ZmI2ODdmYg==
+    YmNlNWMxYmI4MzhiMTdjZmU5ZjU0YzBhZDlhY2MyNTgyMTcwMmZiYQ==
   data.tar.gz: !binary |-
-    M2EwMTEzMzUwNTk0NWJlOTQ3OTI5NDRhZGNlYzhmOWFkZDExMWUzZg==
+    Nzk2YmZmODFhM2M3NjhiZDYzMGE3ZDQ5MjczMzUwOTc1NzJkODllOA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YmI4OTFmYWI0MzYwMDE0NTg0MjEyMWEyZTk1M2EzODlkNjY3YmQ5MzZlMzlj
-    MDA4Y2U2ZDJlNWU0Yjc5NDk3NTUzMDE3N2YzMWY1ZWFjZjliN2EyYjJkMDk4
-    Nzg2MTI0YWQyYWUzODM2NmFjZWY3MmFlNzZjYTYyMGE0MmEzZmY=
+    ZTMzY2NkMjM5MjQ3MmExYzBiMzFkM2RkNjM0MDBlZTIxMTQxMmRkMTZmNTUx
+    OTNlMDc0MDE1NGEyODBkNjI3YzIyNWViYTRlNjYxNzNmOGVhYTdiZTY3ZTUw
+    ZWQ2NWI4ZDgwMTNkNmVjZTIwMzQzOWMwMjBmNDZmMGMyYjNiOTM=
   data.tar.gz: !binary |-
-    MDQ2MTM2ZTU3NjEwMDNiOTUyMmU2NWM4YmJlMDhlNDRkMDE0MDhjMGE1MTNi
-    MzAyYjBkYjcxZWI5MjkwN2ViYTEwZjkzNWZkZTBlZDFjNmY5ODFjZjNlNTE4
-    NTA1YmVmZTRhN2QzZGUyMjJhNjMyNzJmYmRlMTRhNTZmNGM1NjY=
+    ODVhYjgwMzIyYzY2ZTI2ZDEyNTllNzZjNWI1MTkzYzgyYWMwNDI5MTI0ZmJi
+    MWEyZGJjZWE0NWM1NjdjYTEzMzBmZWU2NTI2N2RjZTBiNjU4MDE5MDMxOTAw
+    MGYwMTFjZDgxZGJmYTkzOTE4Y2Q4MTk4ODZhNDc4MjA0ZGZkY2M=

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.geocoding-cache

data/bin/itinerary

@@ -6,6 +6,8 @@ require 'itinerary/tool'
 
 require 'itinerary/tools/convert'
 require 'itinerary/tools/create'
+require 'itinerary/tools/diff'
+require 'itinerary/tools/edit'
 require 'itinerary/tools/find-dups'
 require 'itinerary/tools/import'
 require 'itinerary/tools/list'

data/itinerary.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rake'
 
   gem.add_runtime_dependency 'builder'
-  gem.add_runtime_dependency 'daybreak', '0.2.4'
+  gem.add_runtime_dependency 'daybreak'
   gem.add_runtime_dependency 'faraday'
   gem.add_runtime_dependency 'faraday_middleware'
   gem.add_runtime_dependency 'geocoder'

data/lib/itinerary.rb

@@ -28,7 +28,7 @@ class Itinerary
     @name = options[:name]
     @root = options[:root] or raise "Must specify root"
     @root = Pathname.new(@root).expand_path
-    @geocoding_cache_path = options[:geocoding_cache] || '.geocoding-cache'
+    @geocoding_cache_path = @root + (options[:geocoding_cache] || '.geocoding-cache')
     setup_geocoding_cache
     @entries = []
     read_entries
@@ -125,8 +125,15 @@ class Itinerary
         when :radius
           # ignored here -- used above
         when :flags
+          matched.reject! do |rec|
+            value.find do |f, v|
+              rec.method("#{f}?").call != v
+            end
+          end
+        when :entries
+          values = value.split(',').map { |v| v[0] == '/' ? Pathname.new(v) : v }
           matched.select! do |rec|
-            value.find { |v| rec.method("#{v}?").call }
+            values.find { |v| rec.match(v, self) }
           end
         else
           raise "Unknown field: #{key.inspect}" unless Record.field(key) || Record.instance_methods.include?(key)
@@ -149,8 +156,16 @@ class Itinerary
     matches
   end
 
-  def [](path)
-    @entries.find { |r| r.path == path }
+  def find(query)
+    @entries.find { |r| r.match(query, self) }
+  end
+
+  def select(query)
+    @entries.select { |r| r.match(query, self) }
+  end
+
+  def [](query)
+    find(query)
   end
 
   def parse_params(params)
@@ -163,7 +178,12 @@ class Itinerary
       when :radius
         filters.radius = value.to_f
       when :flags
-        filters.flags = value.split(',').map { |f| f.to_sym }
+        filters.flags = Hash[
+          value.split(',').map do |v|
+            v =~ /^(!?)(\w+)$/ or raise "Invalid flag specification: #{v.inspect}"
+            [$2.to_sym, ($1 != '!')]
+          end
+        ]
       when :show_fields
         options.show_fields = value.split(',').map { |f| f.to_sym }
       when :hide_fields

data/lib/itinerary/record.rb

@@ -159,11 +159,31 @@ class Itinerary
     end
 
     def visited?
-      visited && visited < DateTime.now
+      !visited.nil? && visited < DateTime.now
     end
 
     def to_visit?
-      visited && visited >= DateTime.now
+      !visited.nil? && visited >= DateTime.now
+    end
+
+    def contacted?
+      !contacted.nil?
+    end
+
+    def declined?
+      !declined.nil?
+    end
+
+    def match(query, itinerary)
+      case query
+      when Pathname
+        query == path
+      when String
+        rpath = path.relative_path_from(itinerary.entries_path).to_s
+        File.fnmatch(query, rpath)
+      else
+        raise "Don't know how to query on #{query.inspect}"
+      end
     end
 
     def string_to_key(str)
@@ -181,16 +201,7 @@ class Itinerary
       path += string_to_key(country) if country
       path += string_to_key(state) if state
       raise "Can't make key from empty name" unless name
-      key = string_to_key(name)
-      i = 1
-      p = nil
-      loop do
-        p = key.dup
-        p += i.to_s if i > 1
-        break unless (path + p).exist?
-        i += 1
-      end
-      path += p
+      path += string_to_key(name)
       path
     end
 
@@ -213,17 +224,18 @@ class Itinerary
 
     def to_text(options={})
       t = StringIO.new
-      field_keys = options[:field_keys] || @@fields.keys
-      field_keys.map { |k| @@fields[k] }.each do |field|
-        next if field.key == :notes
-        value = self[field.key] or next
+      keys = options[:field_keys] || @@fields.keys
+      keys.each do |key|
+        next if key == :notes
+        value = self[key] or next
         if value =~ /\n/
           value = "\n" + value.gsub(/^/, "\t")
         end
-        t.puts "%-#{MaxFieldNameLength + 1}.#{MaxFieldNameLength + 1}s %s" % [field.name + ':', value]
+        field = @@fields[key]
+        t.puts "%-#{MaxFieldNameLength + 1}.#{MaxFieldNameLength + 1}s %s" % [(field ? field.name : key.to_s.capitalize) + ':', value]
       end
       t.puts
-      t.puts notes if notes && field_keys.include?(:notes)
+      t.puts notes if notes && keys.include?(:notes)
       t.rewind
       t.read
     end
@@ -316,16 +328,21 @@ class Itinerary
     end
 
     def print_diff(other)
-      (self.keys + other.keys).sort.uniq.each do |key|
-        if self[key] != other[key]
-          puts "\t" + "#{key}:"
-          if self[key] && !other[key]
-            puts "\t\t" + "- #{self[key].inspect}"
-          elsif !self[key] && other[key]
-            puts "\t\t" + "+ #{other[key].inspect}"
-          elsif self[key] != other[key]
-            puts "\t\t" + "< #{self[key].inspect}"
-            puts "\t\t" + "> #{other[key].inspect}"
+      if self != other
+        puts
+        puts "< #{self.path}"
+        puts "> #{other.path}"
+        (self.keys + other.keys).sort.uniq.each do |key|
+          if self[key] != other[key]
+            puts "\t" + "#{key}:"
+            if self[key] && !other[key]
+              puts "\t\t" + "- #{self[key].inspect}"
+            elsif !self[key] && other[key]
+              puts "\t\t" + "+ #{other[key].inspect}"
+            elsif self[key] != other[key]
+              puts "\t\t" + "< #{self[key].inspect}"
+              puts "\t\t" + "> #{other[key].inspect}"
+            end
           end
         end
       end

data/lib/itinerary/tools/diff.rb

@@ -0,0 +1,18 @@
+class Itinerary
+  class DiffTool < Tool
+
+    def self.name
+      'diff'
+    end
+
+    def parse(args)
+      @recs = args.map { |id| @itinerary[id] or raise "No record with id #{id.inspect}" }
+      raise "Can only diff two records" if @recs.length != 2
+    end
+
+    def run
+      @recs[0].print_diff(@recs[1])
+    end
+
+  end
+end

data/lib/itinerary/tools/edit.rb

@@ -0,0 +1,37 @@
+class Itinerary
+  class EditTool < Tool
+
+    def self.name
+      'edit'
+    end
+
+    def parse(args)
+      @recs = args.map { |id| @itinerary[id] or raise "No record with id #{id.inspect}" }
+    end
+
+    def run
+      @recs.each do |rec|
+        old_rec = rec.dup
+        rec.edit(:wait => true)
+        rec = Record.load(rec.path)
+        if rec == old_rec
+          warn "Unchanged"
+          next
+        end
+        unless rec.geocoded?
+          rec.geocode or raise "Failed to geocode #{rec.address.inspect} (entry left in #{rec.path})"
+          rec.save!
+        end
+        old_rec.print_diff(rec)
+        new_path = rec.make_path(@itinerary.entries_path)
+        if new_path != rec.path
+          old_path = rec.path
+          rec.path.rename(new_path)
+          rec.path = new_path
+          warn "Renamed #{old_path} to #{new_path}"
+        end
+      end
+    end
+
+  end
+end

data/lib/itinerary/tools/list.rb

@@ -7,29 +7,28 @@ class Itinerary
 
     def parse(args)
       @view_class = View::Text
+      @params = {}
       while args.first =~ /^-(\w+)$/
         args.shift
-        @view_class = case $1
+        case $1
         when 't'
-          View::Tab
+          @view_class = View::Tab
         when 'h'
-          View::HTML
+          @view_class = View::HTML
         when 'k'
-          View::KML
+          @view_class = View::KML
+        when 'f'
+          key, value = args.shift.split('=', 2)
+          @params[key] = value
         end
       end
-      params = Hash[
-        args.map do |arg|
-          key, value = *arg.split('=', 2)
-          [key.to_sym, value]
-        end
-      ]
-      @filters, @options = @itinerary.parse_params(params)
+      @params[:entries] = args.join(',') unless args.empty?
     end
 
     def run
-      view = @view_class.new(@itinerary, @options)
-      print view.render(@itinerary.entries(@filters))
+      filters, options = @itinerary.parse_params(@params)
+      view = @view_class.new(@itinerary, options)
+      print view.render(@itinerary.entries(filters))
     end
 
   end

data/lib/itinerary/version.rb

@@ -1,5 +1,5 @@
 class Itinerary
 
-  VERSION = '0.1'
+  VERSION = '0.4'
 
 end

data/lib/itinerary/views/text.rb

@@ -3,7 +3,7 @@ class Itinerary
     class Text < View
 
       def render_record(rec)
-        @output.puts "[#{rec.path}]"
+        @output.puts "[#{rec.path.relative_path_from(@itinerary.entries_path)}]"
         @output.puts rec.to_text(:field_keys => @field_keys)
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itinerary
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.4'
 platform: ruby
 authors:
 - John Labovitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-02 00:00:00.000000000 Z
+date: 2013-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -56,16 +56,16 @@ dependencies:
   name: daybreak
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -187,6 +187,8 @@ files:
 - lib/itinerary/tool.rb
 - lib/itinerary/tools/convert.rb
 - lib/itinerary/tools/create.rb
+- lib/itinerary/tools/diff.rb
+- lib/itinerary/tools/edit.rb
 - lib/itinerary/tools/find-dups.rb
 - lib/itinerary/tools/import.rb
 - lib/itinerary/tools/list.rb
@@ -216,7 +218,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Keep track of travel itineraries