fossgit 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f89e1271f8492c9e3b00cb7dc853624f4a8d45f
-  data.tar.gz: 5bfde8253a5a00e3b589734ff913ef87b7881020
+  metadata.gz: b587f5714e832075d9bfa3935c3814e242267712
+  data.tar.gz: 0e0dd8b1f92c433492dd35873f254494b727de1f
 SHA512:
-  metadata.gz: 2403e9e4bc37f9dd76679dffdac327d114296038385af9da4c91f580ade69864497c2e61e5318d57cdda5973dacdca3a955300db5368083b39f822ed90e4fb7f
-  data.tar.gz: 402e5d4d0379c38db310bcdad31e789b9f388c010965b3fb1f20538d564b17f023d276396543536c88a6c5be1899f06ae72a90e06c9f495ab9beaa457f6eb44f
+  metadata.gz: fd6d9a5534f350c48b55ed9c754e031e058ff7bdba4401417999f6cac2df4394e7f4bc09243c9eabd2b002b28d1e8e0cb690d323083dabe36740dac45f629e48
+  data.tar.gz: 9edbe6e60d9d38398e4c196cce02d191afe45e6ab8cbd665b297a1758fd7cec5837fc557ce753baefb6564253645871bd429db69c40579bdaabb864272748ff6

data/bin/fossgit

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 require 'fossgit'
 
-@fossil_repository = nil
+@fg = FossGit.new Dir.pwd
 
 def mirror_command
   [fossil_command, sed_command, git_command].join '|'
@@ -16,7 +16,7 @@ def fossil_command
 
   cmd << "--import-marks #{fossil_marks}" if update_export?
   cmd << "--export-marks #{fossil_marks}"
-  cmd << fossil_repository
+  cmd << @fg.fossil_repository
 
   cmd.join ' '
 end
@@ -64,22 +64,10 @@ def option_switch? long_name
   ARGV.delete "-#{long_name[0]}" or ARGV.delete "--#{long_name}"
 end
 
-def fossil_repository
-  idregex = /^repository: +/
-
-  @fossil_repository ||= File.absolute_path(
-    `fossil status`.split(/\n/).select do |line|
-      line.match idregex
-    end.first.sub idregex, ''
-  )
-end
-
 name = File.basename $0
 
-fg = FossGit.new
-
 if option_switch? 'help'
-  puts fg.help_text name
+  puts FossGit.help_text name
   exit
 elsif option_switch? 'version'
   puts [name, FossGit.version].join ' '

data/lib/fossgit.rb

@@ -1,9 +1,19 @@
 class FossGit
+  attr_reader :checkout_path
+  attr_reader :fossil_repository
+
+  def initialize checkout_path=''
+    @checkout_path = checkout_path
+    @checkout_path = get_element_matching :'local-root'
+
+    @fossil_repository = get_repository_path
+  end
+
   def self.version
-    '1.0.1'
+    '1.0.2'
   end
 
-  def help_text name='fossgit'
+  def self.help_text name='fossgit'
     help = <<-EOF
 
       FossGit provides a simple tool for creating Git mirrors of Fossil
@@ -19,8 +29,8 @@ class FossGit
 
           By default, when exporting to local Git repository GITREPO, #{name}
           attempts to push updates to a configured upstream Git repository.  It
-          harmlessly fails to push if no upstream repository is configured for the
-          local Git repository.
+          harmlessly fails to push if no upstream repository is configured for
+          the local Git repository.
 
       OPTIONS/ARGUMENTS:
 
@@ -28,18 +38,18 @@ class FossGit
                           arguments.
 
           -c CHECKOUT     Specify the location of your Fossil repository's open
-                          checkout, CHECKOUT.  This is optional; you may simply use
-                          this tool from within an open checkout of your Fossil
-                          repository instead.
+                          checkout, CHECKOUT.  This is optional; you may simply
+                          use this tool from within an open checkout of your
+                          Fossil repository instead.
 
-          -l              Perform local-only mirror operations, without trying to
-                          push Git updates to a remote repository.  By default,
-                          #{name} tries to push to an upstream Git repository
-                          whenever it exports from Fossil to Git.
+          -l              Perform local-only mirror operations, without trying
+                          to push Git updates to a remote repository.  By
+                          default, #{name} tries to push to an upstream Git
+                          repository whenever it exports from Fossil to Git.
 
           -t              Dump export to STDOUT rather than sending it to Git.
-                          This overrides the `-l` option and GITREPO argument, if
-                          present.
+                          This overrides the `-l` option and GITREPO argument,
+                          if present.
 
           GITREPO         Specify the location of your local Git repository.
 
@@ -53,4 +63,25 @@ class FossGit
 
     EOF
   end
+
+  private
+
+  def get_repository_path
+    File.absolute_path get_element_matching :repository
+  end
+
+  def get_element_matching key
+    key_regex = /^#{key}: +/
+    fossil_status.select {|line| line.match key_regex }.first.sub key_regex, ''
+  end
+
+  def fossil_status
+    Dir.chdir checkout_path
+
+    if system 'fossil status'
+      `fossil status`.split(/\n/)
+    else
+      raise ArgumentError, "#{checkout_path} is not a valid checkout path"
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fossgit
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Chad Perrin
@@ -10,8 +10,7 @@ bindir: bin
 cert_chain: []
 date: 2017-02-07 00:00:00.000000000 Z
 dependencies: []
-description: |2
-      Maintain a presence in Git hosting for Fossil projects.
+description: "    Maintain a presence in Git hosting for Fossil projects.\n"
 email: code@apotheon.net
 executables:
 - fossgit