gitreport 0.0.10 → 0.1.0

data/Rakefile

@@ -15,10 +15,10 @@ require 'jeweler'
 Jeweler::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
   gem.name = "gitreport"
-  gem.homepage = "http://github.com/janroesner/gitreport"
+  gem.homepage = "https://github.com/gitreport/gitreport-client"
   gem.license = "MIT"
-  gem.summary = %Q{gitreport tracks commit and push info of your git projects}
-  gem.description = %Q{gitreport keeps track of your projects. It collects info about commited and pushed data, submits it to our servers and provides a gorgous frontend to examine, discover and extract the data that you need to generate the payment recipes for your customers. No longer searching or `what did I commit when and where`...}
+  gem.summary = %Q{gitreport tracks your commits and pushes metadata to gitreport.com}
+  gem.description = %Q{gitreport keeps track of your projects. It collects info about commited and pushed data, submits it to gitreport.com and provides a gorgous frontend to examine, discover and extract the data that you need to generate the payment recipes for your customers, measure your performance, find gaps and get an overview about your work. No longer searching or `what did I commit when and where`...}
   gem.email = "jan@roesner.it"
   gem.authors = ["Jan Roesner"]
   # dependencies defined in Gemfile

data/VERSION

@@ -1 +1 @@
-0.0.10
+0.1.0

data/bin/gitreport

@@ -5,25 +5,31 @@ require "rubygems"
 require 'trollop'
 require "gitreport"
 
-SUB_COMMANDS = %w(activate deactivate commit sync import)
+SUB_COMMANDS = %w(init activate deactivate commit sync import)
+
+def version_info
+  File.read(File.dirname(__FILE__)+"/../VERSION").strip
+end
 
 def parse_options
 
   global_opts = Trollop::options do
+    version "gitreport #{version_info} (c) 2011 gitreport.com team"
     banner <<-EOS
 gitreport is a commandline tool to synchronize your git repo's with gitreport.com
 
 Usage: gitreport <subcommand> [options]
 
-<subcommand> must be one of activate, deactivate, commit, sync, import
+<subcommand> must be one of init, activate, deactivate, commit, sync, import
 
 Examples:
 
-gitreport activate   - register your project with gitreport.com
+gitreport init       - activate automatic data transfer and import existing commit's metadata
+gitreport activate   - activate automatic data transfer
 gitreport deactivate - unregister your project from gitreport.com
-gitreport commit     - manually transfer your last and stored (offline) commits to gitreport.com
-gitreport sync       - manually transfer stored (offline) commits to gitreport.com
-gitreport import     - import all the commits of a project to gitreport.com
+gitreport commit     - manually transfer your last and stored (offline) commit's metadata to gitreport.com
+gitreport sync       - manually transfer stored (offline) commit's metadata to gitreport.com
+gitreport import     - import existing commits metadata
 
 gitreport allows the folling [options]:
     EOS
@@ -40,6 +46,9 @@ gitreport allows the folling [options]:
 
   cmd_opts =
     case cmd
+    when "init"
+      GitReport::Hook.set!
+      GitReport::BatchSender.send! :history
     when "activate"
       GitReport::Hook.set!
     when "deactivate"

data/gitreport.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = "gitreport"
-  s.version = "0.0.10"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jan Roesner"]
-  s.date = "2011-11-07"
-  s.description = "gitreport keeps track of your projects. It collects info about commited and pushed data, submits it to our servers and provides a gorgous frontend to examine, discover and extract the data that you need to generate the payment recipes for your customers. No longer searching or `what did I commit when and where`..."
+  s.date = "2011-11-17"
+  s.description = "gitreport keeps track of your projects. It collects info about commited and pushed data, submits it to gitreport.com and provides a gorgous frontend to examine, discover and extract the data that you need to generate the payment recipes for your customers, measure your performance, find gaps and get an overview about your work. No longer searching or `what did I commit when and where`..."
   s.email = "jan@roesner.it"
   s.executables = ["gitreport"]
   s.extra_rdoc_files = [
@@ -74,13 +74,14 @@ Gem::Specification.new do |s|
     "spec/models/storage_spec.rb",
     "spec/models/supplier_spec.rb",
     "spec/spec_helper.rb",
-    "spec/support/fake_repository.rb"
+    "spec/support/fake_repository.rb",
+    "templates/gitreport-post-commit.bash"
   ]
-  s.homepage = "http://github.com/janroesner/gitreport"
+  s.homepage = "https://github.com/gitreport/gitreport-client"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
   s.rubygems_version = "1.8.10"
-  s.summary = "gitreport tracks commit and push info of your git projects"
+  s.summary = "gitreport tracks your commits and pushes metadata to gitreport.com"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/lib/hook.rb

@@ -5,27 +5,42 @@ module GitReport
 
     # creates a hook file if not exists and adds our hook line if it does not exist already
     def self.set!
-      create_hook_file! unless hook_file_exists?
-      set_hook! if hook_file_exists?
+      create_hook_file! unless (file_exists? hook_file)
+      set_hook!
     end
 
     def self.remove!
-      remove_hook! if hook_file_exists?
+      remove_hook! if (file_exists? hook_file)
     end
 
     private
 
     # creates a git hook file
     def self.create_hook_file!
-      write_to_file doc
+      write_to_file hook_file, doc
+    end
+
+    # creates the custom hook if it does not exist already
+    def self.create_custom_hook!
+      write_to_file(custom_hook_file, custom_hook_doc) unless file_exists? custom_hook_file
+    end
+
+    # set's our hook line into an existing hook file if it does not exist already
+    # create the custom hook file as well
+    def self.set_hook!
+      set_line! unless line_exists?
+      create_custom_hook!
+      puts "Successfully registered post-commit hook."
+    rescue
+      puts "Error during setting the hook, gitreport will not work as expected!"
     end
 
     # writes given data to hook file
-    def self.write_to_file data
+    def self.write_to_file file, data
       begin
-        File.open(hook_file, 'w') {|f| f.write(data);f.chmod(0755);f.close }
+        File.open(file, 'w') {|f| f.write(data);f.chmod(0755);f.close }
       rescue Exception => e
-        puts "Error while writing hookfile #{hook_file}: #{e}"
+        puts "Error while writing hookfile #{file}: #{e}"
         return false
       end
 
@@ -36,25 +51,19 @@ module GitReport
     def self.file_content
       begin
         File.open(hook_file, 'r').read
-        # @@content ||= File.open(hook_file, 'r').read
       rescue Exception => e
         puts "Error while reading hookfile #{hook_file}: #{e}"
       end
     end
 
     # returns true if a git hook file already exists, false else
-    def self.hook_file_exists?
-      File.exists? hook_file
-    end
-
-    # set's our hook line into an existing hook file if it does not exist already
-    def self.set_hook!
-      puts "Successfully registered post-commit hook." if (set_line! unless line_exists?)
+    def self.file_exists? file
+      File.exists? file
     end
 
     # returns true if the hook file already has a hook line in
     def self.line_exists?
-      if file_content.match(/nohup\sbundle\sexec\sgitreport\scommit\s>\s\/dev\/null\s2>\s\/dev\/null\s<\s\/dev\/null\s&/)
+      if file_content.match(/\nnohup\s\.git\/hooks\/gitreport-post-commit\s>\s\/dev\/null\s2>\s\/dev\/null\s<\s\/dev\/null\s&\n/)
         return true
       end
 
@@ -63,7 +72,7 @@ module GitReport
 
     # sets our hook line
     def self.set_line!
-      write_to_file(file_content + line)
+      write_to_file hook_file, (file_content + line)
     end
 
     # returns the hook files path
@@ -71,51 +80,65 @@ module GitReport
       @@file ||= GitReport.project.path + "/.git/hooks/post-commit"
     end
 
+    # returns the custom hook files path
+    def self.custom_hook_file
+      @@custom_hook_file ||= GitReport.project.path + "/.git/hooks/gitreport-post-commit"
+    end
+
     # returns the document header
     def self.doc
       "#!/bin/sh\n" +
-      "# This is a post-commit hook created by gitreport (http://gitreport.com)\n" +
-      "#\n" +
-      "# To remove it issue 'bundle exec deactivate' in the projects main directory\n" +
-      "# In case the gitreport gem is not installed anymore, simply remove this hook file\n" +
-      "#\n" +
-      "# Be aware of other post commit hooks that my be mentioned here!\n"
+        "# This is a post-commit hook created by gitreport (http://gitreport.com)\n" +
+        "#\n" +
+        "# To remove it issue 'bundle exec deactivate' in the projects main directory\n" +
+        "# In case the gitreport gem is not installed anymore, simply remove this hook file\n" +
+        "#\n" +
+        "# Be aware of other post commit hooks that my be mentioned here!\n"
     end
 
     # returns the line to activate gitreport via post commit hook
     def self.line
-      "\nnohup bundle exec gitreport commit > /dev/null 2> /dev/null < /dev/null &\n"
+      "\nnohup .git/hooks/gitreport-post-commit > /dev/null 2> /dev/null < /dev/null &\n"
     end
 
-    # removes the hook
-    def self.remove_hook!
-      (remove_hook_file!; return) if hook_file_unchanged?
-      remove_line! if line_exists?
+    # returns the custom hook for gitreport
+    def self.custom_hook_doc
+      File.read(File.dirname(__FILE__) + "/../templates/gitreport-post-commit.bash")
     end
 
-    # removes the hook file
-    def self.remove_hook_file!
+    # removes the hook
+    def self.remove_hook!
       begin
-        File.unlink(hook_file)
-        puts "Successfully removed gitreport post-commit hook (file).\n"
+        remove_file!(custom_hook_file) if file_exists? custom_hook_file
+        if hook_file_unchanged?
+          remove_file! hook_file
+        else
+          remove_line! if line_exists?
+        end
+        puts "Successfully removed gitreport post-commit hook files.\n"
       rescue Exception => e
-        puts "Error while removing hookfile #{hook_file}: #{e}"
+        puts "Error while removing hookfiles: #{e}"
       end
     end
 
+    # removes the the given hook file
+    def self.remove_file! file
+      File.unlink(file)
+    end
+
     # returns true if the hook file is ours and was not changed
     def self.hook_file_unchanged?
-      Digest::SHA1.hexdigest(file_content) == "e4032a91bb8e07e09ea637c803d8763e26e165e7"
+      Digest::SHA1.hexdigest(file_content) == "004c9e7c9124ead7ed347fac7996bd92b6e4e3b9"
     end
 
     # removes our hook line from hook file
     def self.remove_line!
-      puts "Successfully removed gitreport post-commit hook.\n" if write_to_file(clean_up(file_content))
+      puts "Successfully removed gitreport post-commit hook.\n" if write_to_file(hook_file, (clean_up(file_content)))
     end
 
     # removes our hook line from given content
     def self.clean_up content
-      content.gsub(/\nnohup\sbundle\sexec\sgitreport\scommit\s>\s\/dev\/null\s2>\s\/dev\/null\s<\s\/dev\/null\s&\n/,'')
+      content.gsub(/\nnohup\s\.git\/hooks\/gitreport-post-commit\s>\s\/dev\/null\s2>\s\/dev\/null\s<\s\/dev\/null\s&\n/,'')
     end
 
   end

data/spec/models/hook_spec.rb

@@ -18,7 +18,7 @@ describe 'GitReport::Hook' do
       (File.exists?(hook_file)).should be_true
       content = File.open(hook_file, 'r').read
 
-      content.match(/\nnohup\sbundle\sexec\sgitreport\scommit\s>\s\/dev\/null\s2>\s\/dev\/null\s<\s\/dev\/null\s&\n/).should be_true
+      content.match(/\nnohup\s\.git\/hooks\/gitreport-post-commit\s>\s\/dev\/null\s2>\s\/dev\/null\s<\s\/dev\/null\s&\n/).should be_true
     end
 
     it 'should insert the gitreport hook into an existing post-commit hook file' do
@@ -30,7 +30,15 @@ describe 'GitReport::Hook' do
 
       GitReport::Hook.set!
       content = File.open(hook_file, 'r').read
-      content.match(/\nnohup\sbundle\sexec\sgitreport\scommit\s>\s\/dev\/null\s2>\s\/dev\/null\s<\s\/dev\/null\s&\n/).should be_true
+      content.match(/\nnohup\s\.git\/hooks\/gitreport-post-commit\s>\s\/dev\/null\s2>\s\/dev\/null\s<\s\/dev\/null\s&\n/).should be_true
+    end
+
+    it 'should create the custom hook file' do
+      custom_hook_file = "#{GitReport.project.path}/.git/hooks/gitreport-post-commit"
+
+      GitReport::Hook.set!
+
+      (File.exists?(custom_hook_file)).should be_true
     end
   end
 
@@ -57,7 +65,18 @@ describe 'GitReport::Hook' do
       (File.exists?(hook_file)).should be_true
       content = File.open(hook_file, 'r').read
       content.should match(/\ssome\spreexisting\shook\sfile\n/)
-      content.should_not match(/\nnohup\sbundle\sexec\sgitreport\scommit\s>\s\/dev\/null\s2>\s\/dev\/null\s<\s\/dev\/null\s&\n/)
+      content.should_not match(/\nnohup\s\.git\/hooks\/gitreport-post-commit\s>\s\/dev\/null\s2>\s\/dev\/null\s<\s\/dev\/null\s&\n/)
+    end
+
+    it 'should remove the custom hook file' do
+      custom_hook_file = "#{GitReport.project.path}/.git/hooks/post-commit"
+      File.open(custom_hook_file, 'w+') do |file|
+        file.write "# some existing custom hook file\n"
+      end
+
+      GitReport::Hook.remove!
+
+      (File.exists?(custom_hook_file)).should be_true
     end
   end
 end

data/templates/gitreport-post-commit.bash

@@ -0,0 +1,30 @@
+#!/bin/bash
+# This is a post-commit hook created by gitreport (http://gitreport.com)
+#
+# To remove it issue 'bundle exec deactivate' in the projects main directory
+# In case the gitreport gem is not installed anymore, simply remove this hook file
+# and remove the calling line from git's 'post-commit' if there is any
+
+bundler-installed()
+{
+  which bundle > /dev/null 2>&1
+}
+
+within-bundled-project(){
+  local dir="$(pwd)"
+  while [ "$(dirname $dir)" != "/" ]; do
+      [ -f "$dir/Gemfile" ] && return
+      dir="$(dirname $dir)"
+  done
+  false
+}
+
+run-with-bundler(){
+  if bundler-installed && within-bundled-project; then
+      bundle exec $@
+  else
+      $@
+  fi
+}
+
+run-with-bundler gitreport commit

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitreport
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-07 00:00:00.000000000Z
+date: 2011-11-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70101752506060 !ruby/object:Gem::Requirement
+  requirement: &70163877795920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70101752506060
+  version_requirements: *70163877795920
 - !ruby/object:Gem::Dependency
   name: spork
-  requirement: &70101752502720 !ruby/object:Gem::Requirement
+  requirement: &70163877794280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>'
@@ -32,10 +32,10 @@ dependencies:
         version: 0.9.0.rc
   type: :development
   prerelease: false
-  version_requirements: *70101752502720
+  version_requirements: *70163877794280
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70101752498940 !ruby/object:Gem::Requirement
+  requirement: &70163877790060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70101752498940
+  version_requirements: *70163877790060
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70101752495420 !ruby/object:Gem::Requirement
+  requirement: &70163877782580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70101752495420
+  version_requirements: *70163877782580
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70101752492500 !ruby/object:Gem::Requirement
+  requirement: &70163877776460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70101752492500
+  version_requirements: *70163877776460
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70101752490200 !ruby/object:Gem::Requirement
+  requirement: &70163877767500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70101752490200
+  version_requirements: *70163877767500
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70101752488580 !ruby/object:Gem::Requirement
+  requirement: &70163877764560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70101752488580
+  version_requirements: *70163877764560
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70101752486240 !ruby/object:Gem::Requirement
+  requirement: &70163877763020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,11 +98,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70101752486240
+  version_requirements: *70163877763020
 description: gitreport keeps track of your projects. It collects info about commited
-  and pushed data, submits it to our servers and provides a gorgous frontend to examine,
-  discover and extract the data that you need to generate the payment recipes for
-  your customers. No longer searching or `what did I commit when and where`...
+  and pushed data, submits it to gitreport.com and provides a gorgous frontend to
+  examine, discover and extract the data that you need to generate the payment recipes
+  for your customers, measure your performance, find gaps and get an overview about
+  your work. No longer searching or `what did I commit when and where`...
 email: jan@roesner.it
 executables:
 - gitreport
@@ -168,7 +169,8 @@ files:
 - spec/models/supplier_spec.rb
 - spec/spec_helper.rb
 - spec/support/fake_repository.rb
-homepage: http://github.com/janroesner/gitreport
+- templates/gitreport-post-commit.bash
+homepage: https://github.com/gitreport/gitreport-client
 licenses:
 - MIT
 post_install_message: 
@@ -183,7 +185,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2055649253981737868
+      hash: -1609412549187430430
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -195,5 +197,5 @@ rubyforge_project:
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: gitreport tracks commit and push info of your git projects
+summary: gitreport tracks your commits and pushes metadata to gitreport.com
 test_files: []