gitreport 0.0.4 → 0.0.5

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/bin/gitreport

@@ -29,12 +29,15 @@ gitreport allows the folling [options]:
     EOS
 
     opt :dry_run, "Don't actually do anything", :short => "-n"
+    opt :trace, "Print out stack trace in case of an error", :short => "-t"
     stop_on SUB_COMMANDS
   end
 
   cmd = ARGV.shift
   Trollop::die "You must specify at least one command" unless cmd
 
+  GitReport.global_opts = global_opts
+
   cmd_opts =
     case cmd
     when "activate"

data/gitreport.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "gitreport"
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jan Roesner"]

data/lib/batch_sender.rb

@@ -43,11 +43,32 @@ module GitReport
           request.body = body(batch)
           http.open_timeout = configuration.timeout
           http.read_timeout = configuration.timeout
-          http.request request
+          http.request request unless GitReport.global_opts[:dry_run]
         end
-        raise StandardError unless (response.code == "200" or response.code == "401")
+        raise GitReport::ServerError unless (response.code == "200" or response.code == "401") unless GitReport.global_opts[:dry_run]
       rescue Exception => e
-        puts "Error during sending the commit batch: #{e}"
+        if e.is_a?(GitReport::ServerError)
+          puts "A server error occured during data transfer."
+          if GitReport.global_opts[:trace]
+            puts "Exception: #{e}\n"
+            puts "Message: #{JSON.parse(response.body)["message"]}\n"
+          else
+            puts "Run with --trace to get more info."
+          end
+          exit
+        else
+          puts "A client error occured during data transfer."
+          if GitReport.global_opts[:trace]
+            puts "Exception: #{e}\n"
+            e.backtrace.each do |line|
+              puts "#{line}\n"
+            end
+          else
+            puts "Run with --trace to get more info."
+          end
+          exit
+        end
+
         return false
       end
 

data/lib/gitreport.rb

@@ -18,6 +18,8 @@ require 'supplier'
 
 module GitReport
 
+  class ServerError < StandardError;end
+
   # mattr_reader
   def self.project
     @@project ||= GitReport::Project.new
@@ -27,4 +29,12 @@ module GitReport
     @@config ||= GitReport::Configuration.new
   end
 
+  def self.global_opts= options={}
+    @@global_opts = options
+  end
+
+  def self.global_opts
+    @@global_opts || {}
+  end
+
 end

data/lib/sender.rb

@@ -4,9 +4,23 @@ module GitReport
 
     # sends or saves the commits
     def self.send! options = nil
-      commits = GitReport::Supplier.commits(options)
+      begin
+        commits = GitReport::Supplier.commits(options)
+      rescue Exception => e
+        puts "A client error occured during data transfer."
+        if GitReport.global_opts[:trace]
+          puts "Exception: #{e}\n"
+          e.backtrace.each do |line|
+            puts "#{line}\n"
+          end
+        else
+          puts "Run with --trace to get more info."
+        end
+        exit
+      end
+
       commits.each do |commit|
-        send_data!(commit) ? commits = commits.inject([]){ |a,i| ( a << i unless i == commit );a } : break # weird, delete fails here
+        send_data!(commit) ? commits = commits.inject([]){ |a,i| ( a << i unless i == commit );a } : break
       end
       storage.save! commits
 
@@ -24,11 +38,23 @@ module GitReport
           request.body = commit.to_json
           http.open_timeout = configuration.timeout
           http.read_timeout = configuration.timeout
-          http.request request
+          http.request request unless GitReport.global_opts[:dry_run]
         end
-        raise StandardError unless (response.code == "201" or response.code == "401")
+        raise GitReport::ServerError unless (response.code == "201" or response.code == "401") unless GitReport.global_opts[:dry_run]
       rescue Exception => e
-        puts "Error during sending the commit: #{e}"
+        if e.is_a?(GitReport::ServerError)
+          puts "A server error occured during data transfer."
+          if GitReport.global_opts[:trace]
+            puts "Exception: #{e}\n"
+            puts "Message: #{JSON.parse(response.body)["message"]}\n"
+          else
+            puts "Run with --trace to get more info."
+          end
+        else
+          puts "A client error occured during data transfer."
+          puts "Exception: #{e}\n"
+        end
+
         return false
       end
 

data/spec/models/batch_sender_spec.rb

@@ -28,6 +28,13 @@ describe 'GitReport::BatchSender' do
       data["project"].size.should == 7
       data["project"]["project_name"].should == GitReport.project.name
     end
+
+    it 'should not raise an error in case of the word commit at the start of a commit message' do
+      @repo.create_error_commit1
+
+      lambda{ body = GitReport::BatchSender.body(GitReport::BatchSender.batches(:history).first) }.should_not raise_error
+    end
+
   end
 
   describe '#batches' do

data/spec/support/fake_repository.rb

@@ -55,6 +55,31 @@ class FakeRepository
     return @project_dir
   end
 
+  def create_error_commit1
+    @project_dir = Dir.new(File.dirname(Tempfile.new('fake').path)).path + "/project"
+    FileUtils.rm_rf Dir.glob(@project_dir)
+    FileUtils.rmdir @project_dir if File.exists?(@project_dir)
+    Dir.mkdir(@project_dir) unless File.exists?(@project_dir)
+
+    # create a project
+    project = Git.init(@project_dir)
+
+    # add a first commit
+    File.open("#{@project_dir}/file1", 'w+') do |file|
+      file.write "file content 1"
+    end
+
+    project.add('file1')
+    project.commit('commit with file1')
+
+    File.open("#{@project_dir}/file2", 'w+') do |file|
+      file.write "This commit will cause an error in the git library"
+    end
+
+    project.add('file2')
+    project.commit("Resque to the rescue\n\ncommit batches are processed async now.")
+  end
+
   def create_project_config_file
     File.open("#{@project_dir}/.gitreport", 'w+') do |file|
       file.write "---\n"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitreport
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-10-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70316481662060 !ruby/object:Gem::Requirement
+  requirement: &70199993266920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70316481662060
+  version_requirements: *70199993266920
 - !ruby/object:Gem::Dependency
   name: spork
-  requirement: &70316481661580 !ruby/object:Gem::Requirement
+  requirement: &70199993266440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>'
@@ -32,10 +32,10 @@ dependencies:
         version: 0.9.0.rc
   type: :development
   prerelease: false
-  version_requirements: *70316481661580
+  version_requirements: *70199993266440
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70316481661100 !ruby/object:Gem::Requirement
+  requirement: &70199993265960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70316481661100
+  version_requirements: *70199993265960
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70316481676980 !ruby/object:Gem::Requirement
+  requirement: &70199993282620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70316481676980
+  version_requirements: *70199993282620
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70316481676500 !ruby/object:Gem::Requirement
+  requirement: &70199993282140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70316481676500
+  version_requirements: *70199993282140
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70316481676020 !ruby/object:Gem::Requirement
+  requirement: &70199993281660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70316481676020
+  version_requirements: *70199993281660
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70316481675540 !ruby/object:Gem::Requirement
+  requirement: &70199993281180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70316481675540
+  version_requirements: *70199993281180
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70316481675060 !ruby/object:Gem::Requirement
+  requirement: &70199993280700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70316481675060
+  version_requirements: *70199993280700
 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
@@ -181,7 +181,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1648662847194769889
+      hash: 545720071683109079
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: