git-graph 0.1.0 → 0.1.1

data/Readme.md

@@ -19,9 +19,9 @@ git-graph --interval day --output csv "cat Readme.md | wc -l"
 
 ```Bash
 # number of lines in the readme as line-chart (via google charts)
-git-graph --interval year --output chart "cat Gemfile.lock | grep DEPENDENCIES -A 999 | wc -l"
+git-graph --interval week --output chart "wc -l Readme.md"
 ```
-![Chart](http://chart.apis.google.com/chart?chs=600x500&cht=lc&chxt=x,y&chxl=0:|2010-03-10|2013-03-09|1:|0|97&chd=s:Aos9&chdl=value&chtt=git-graph)
+![Chart](http://chart.apis.google.com/chart?chs=600x200&cht=lc&chxt=x,y&chxl=0:|2009-05-23|2013-03-09|1:|0|97&chd=s:hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhiijjjkkkkkkkkkkkkkkkkllloooooooooooooooooooooopppppqqqqqqqqqqqqrrrrrrssssssssssssssssssssssssssssssssssssss2222222999999999999999&chdl=Lines&chtt=Readme+lines)
 
 ```Bash
 # number of gems the project depends on

data/bin/git-graph

@@ -4,7 +4,11 @@ $LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'lib')
 require 'git/graph'
 require 'time'
 
-options = {}
+options = {
+  :chart_dimensions => '600x500',
+  :value_name => "value",
+  :chart_title => "git-chart"
+}
 OptionParser.new do |opts|
   opts.banner = <<BANNER
 Make graphs from your git history.
@@ -19,6 +23,9 @@ BANNER
   opts.on("-o", "--output FORMAT", "Output format - csv|chart") { |format| options[:format] = format }
   opts.on("-i", "--interval INTERVAL", "Interval of git history - year|week|day)") { |interval| options[:interval] = interval }
   opts.on("-b", "--bundle", "Bundle before running command") { options[:bundle] = true }
+  opts.on("--chart-dimensions DIMENSIONS", "Dimensions of the chart (default: #{options[:chart_dimensions]})") { |v| options[:chart_dimensions] = v }
+  opts.on("--value-name NAME", "Name of the value (default: #{options[:value_name]})") { |v| options[:value_name] = v }
+  opts.on("--chart-title TITLE", "Chart title (default: #{options[:chart_title]})") { |v| options[:chart_title] = v }
   opts.on("-h", "--help","Show this.") { puts opts; exit }
   opts.on('-v', '--version','Show Version'){ puts Git::Graph::VERSION; exit}
 end.parse!
@@ -56,8 +63,6 @@ finish = (options[:end] || Time.at(run!("git log --reverse --format='%at' | head
 current = start
 raise "Backwards" if start < finish
 
-data = {}
-
 DAY = 24*60*60
 INTERVALS = {
   "day" => DAY,
@@ -65,38 +70,43 @@ INTERVALS = {
   "year" => 365 * DAY
 }
 
-interval = INTERVALS[options[:interval] || "year"]
+data = {}
+interval = (INTERVALS[options[:interval] || "year"] || raise("unsupported interval"))
 
-while current > finish
-  date = current.strftime("%Y-%m-%d")
-  command = [
-    "git checkout `git rev-list -n 1 --before='#{date}' master`",
-    ("bundle check || bundle" if options[:bundle]),
-    ARGV.first
-  ].compact
-  success, output = without_bundler { run(command.map { |c| "(#{c})" }.join(" && ")) }
-  data[date] = if success
-    value = output.split("\n").last.strip
-    value =~ /^\d+\.\d+$/ ? value.to_f : value.to_i
-  else
-    data.values.last || 0
+begin
+  while current > finish
+    date = current.strftime("%Y-%m-%d")
+    command = [
+      "git checkout -f `git rev-list -n 1 --before='#{date}' master`",
+      ("bundle check || bundle" if options[:bundle]),
+      ARGV.first
+    ].compact
+    success, output = without_bundler { run(command.map { |c| "(#{c})" }.join(" && ")) }
+    data[date] = if success
+      value = output.split("\n").last.to_s.strip
+      value =~ /^\d+\.\d+$/ ? value.to_f : value.to_i
+    else
+      data.values.last || 0
+    end
+    current -= interval
   end
-  current -= interval
+rescue SystemExit, Interrupt
+  $stderr.puts "Data collection interrupted by user"
 end
 
+# print output even if user stops execution
 case options[:format]
 when nil, "csv"
-  puts "Date,value"
+  puts "Date,#{options[:value_name]}"
   data.map do |date, value|
     puts "#{date},#{value}"
   end
 when "chart"
   require "google_chart"
-  title = "git-graph"
   dates = data.keys.reverse
   values = data.values.reverse
-  url = GoogleChart::LineChart.new('600x500', title, false) do |line|
-    line.data("value", values)
+  url = GoogleChart::LineChart.new(options[:chart_dimensions], options[:chart_title], false) do |line|
+    line.data(options[:value_name], values)
     line.axis :x, :labels => [dates.first, dates.last]
     line.axis :y, :labels => ['0', values.max]
   end.to_url

data/lib/git/graph/version.rb

@@ -1,5 +1,5 @@
 module Git
   module Graph
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-graph
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -87,7 +87,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3863793032351926901
+      hash: -3227504656897889005
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -96,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3863793032351926901
+      hash: -3227504656897889005
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24