git-ged 0.0.2 → 0.0.3

data/git-ged.gemspec

@@ -8,8 +8,7 @@ Gem::Specification.new do |s|
 
   s.name              = 'git-ged'
   s.version           = GitGed::VERSION
-  s.date              = '2012-01-05'
-  #s.rubyforge_project = 'git-ged'
+  s.date              = '2012-01-09'
 
   s.summary     = "GEDCOM plugin for Git"
   s.description = "git-ged is a Ruby toolset for managing genealogical data (GEDCOM) inside a Git repository."

data/layout.txt

@@ -105,8 +105,9 @@ GIT-GED CONCEPTS
 - each of the following link attributes refers to another record via permaname+state reference
 - "supersedes" indicates that a person (or family) is a full, identical replacement for another (used to be able to react to remote merges)
 - "superseded-by" indicates that a static, not-to-be-further-edited  person (or family) is left behind after having been merged into the canonical record (used to detect conflicts between local edits & remote merge or vice versa)
-- "derived-from" indicates a clone-and-mutate to disambiguate a fully-merged record that represents two distinct historical persons or families (used to document manual record reconstruction efforts)
 - "same-as" indicates a more-tentative-than-merge attempt at establishing identity to allow for disparate efforts to proceed before attempting a full merge
+- "disambiguated-by" indicates a forward-reference from a person/family that has no useful future except for providing opportunity for fruitful permaname collision & disambiguation hints to users on subsequent imports
+- "derived-from" indicates a record that took a significant amount of data from another record, from which an identity was extracted
 - "not-same-as" indicates a definitive statement that one person (or family) is NOT the same as another (used when extracting a half-merged entity that collided on a permaname)
 - "prior-family" indicates that a family has many of the same members of a prior family, but temporal household dissolution & recomposition require two different families to be tracked (allows for "current family" computations based on a directed graph of prior-family edges)
 

data/lib/git-ged/cli.rb

@@ -11,6 +11,9 @@ module GitGed
 
     # patch until subcommand 1.0.7 comes out
     attr_accessor :appname
+    def print_actions
+      super.sub(/See '.* help COMMAND'/, "See '#{appname} help COMMAND'")
+    end
 
     def initialize
       @options = {}
@@ -22,7 +25,6 @@ module GitGed
         opts.separator "Global options are:"
         opts.on("-v", "--[no-]verbose", "Show git-ged & grit debug") do |v|
           GitGed.debug = v
-          GitGed.grit_debug = v
         end
       end
       add_help_option

data/lib/git-ged/init.rb

@@ -5,7 +5,7 @@ module GitGed
     # Initializes a new git-ged repo
     def init(args, options={})
       system "git init -q #{args.map{|s| "\"#{s}\"" }.join(" ")}"
-      GitGed.log "Created new git-ged repo"
+      GitGed.message "Created new git-ged repo"
     end
 
   end

data/lib/git-ged.rb

@@ -23,7 +23,7 @@ require 'git-ged/init'
 # internal support classes
 
 module GitGed
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 
   class << self
 
@@ -33,21 +33,46 @@ module GitGed
 
     attr_accessor :debug
 
-    def grit_debug= onoff
+    def debug= onoff
       Grit.debug = onoff
+      @debug = onoff
+      @logger.level = onoff ? ::Logger::DEBUG : ::Logger::INFO
     end
 
     # The standard +logger+ for debugging git-ged calls - this defaults to a plain STDOUT logger
     attr_accessor :logger
 
-    def log(str)
-      logger.debug { str }
+    def log(str, &block)
+      if block_given?
+        logger.debug &block
+      else
+        logger.debug str
+      end
+    end
+
+    def message(str)
+      logger.info str
+    end
+
+    private
+
+    def new_logger
+      logger = ::Logger.new STDOUT
+      default_formatter = ::Logger::Formatter.new
+      logger.formatter = lambda do |severity, datetime, progname, msg|
+        if severity == "DEBUG"
+          default_formatter.call(severity, datetime, progname, msg)
+        else
+          msg
+        end
+      end
+      logger
     end
   end
 
-  self.debug = false
-  self.grit_debug = false
+  @logger ||= new_logger
 
-  @logger ||= ::Logger.new(STDOUT)
+  # turn debug logging off by default
+  self.debug = false
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-ged
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-05 00:00:00.000000000 Z
+date: 2012-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grit
-  requirement: &14236180 !ruby/object:Gem::Requirement
+  requirement: &23602420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 2.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *14236180
+  version_requirements: *23602420
 - !ruby/object:Gem::Dependency
   name: subcommand
-  requirement: &14235700 !ruby/object:Gem::Requirement
+  requirement: &23601940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *14235700
+  version_requirements: *23601940
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &14235320 !ruby/object:Gem::Requirement
+  requirement: &23601560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14235320
+  version_requirements: *23601560
 description: git-ged is a Ruby toolset for managing genealogical data (GEDCOM) inside
   a Git repository.
 email: jdsumsion@gmail.com