gitreport 0.0.8 → 0.0.9

data/VERSION

@@ -1 +1 @@
-0.0.8
+0.0.9

data/gitreport.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "gitreport"
-  s.version = "0.0.8"
+  s.version = "0.0.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jan Roesner"]
-  s.date = "2011-10-28"
+  s.date = "2011-11-01"
   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.email = "jan@roesner.it"
   s.executables = ["gitreport"]

data/lib/commit.rb

@@ -78,13 +78,14 @@ module GitReport
       data[:message]            = self.message
       data[:stats]              = self.stats
       if scope == :single
-        data[:project_path]       = @project.path
-        data[:project_name]       = @project.name
-        data[:current_branch]     = @project.branchname
-        data[:remotes]            = @project.remotes.map(&:name)
-        data[:remote_urls]        = @project.remotes.map(&:url)
-        data[:remote_branches]    = @project.remote_branches
-        data[:project_identifier] = self.project_identifier
+        data[:project] = {}
+        data[:current_branch]            = @project.branchname
+        data[:project][:path]            = @project.path
+        data[:project][:name]            = @project.name
+        data[:project][:remotes]         = @project.remotes.map(&:name)
+        data[:project][:remote_urls]     = @project.remotes.map(&:url)
+        data[:project][:remote_branches] = @project.remote_branches
+        data[:project][:identifier]      = self.project_identifier
       end
       data
     end

data/lib/project.rb

@@ -55,9 +55,8 @@ module GitReport
     # aggregates the projects core data
     def aggregate
       data = {}
-      data[:project_path]       = self.path
-      data[:project_name]       = self.name
-      data[:current_branch]     = self.branchname
+      data[:path]               = self.path
+      data[:name]               = self.name
       data[:remotes]            = self.remotes.map(&:name)
       data[:remote_urls]        = self.remotes.map(&:url)
       data[:remote_branches]    = self.remote_branches

data/spec/models/batch_sender_spec.rb

@@ -25,8 +25,8 @@ describe 'GitReport::BatchSender' do
       data["commits"].collect{ |c| c["sha"] }.each do |sha|
         GitReport.project.revlist.include?(sha).should be_true
       end
-      data["project"].size.should == 7
-      data["project"]["project_name"].should == GitReport.project.name
+      data["project"].size.should == 6
+      data["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

data/spec/models/commit_spec.rb

@@ -1,4 +1,4 @@
-# require 'spec_helper'
+require 'spec_helper'
 require 'gitreport'
 
 describe 'GitReport::Commit' do
@@ -61,10 +61,13 @@ describe 'GitReport::Commit' do
   describe '#data' do
     it 'should return the data to be transferred during a single commit including project data' do
       data = @commit.data
-      data.size.should == 14
-      [:project_path, :project_name, :current_branch, :remotes, :remote_urls, :remote_branches].each do |attr|
+      data.size.should == 9
+      [:sha, :short_sha, :author_name, :author_email, :time, :message, :stats, :project, :current_branch].each do |attr|
         data.keys.include?(attr).should be_true
       end
+      [:path, :name, :remotes, :remote_urls, :remote_branches, :identifier].each do |attr|
+        data[:project].keys.include?(attr).should be_true
+      end
     end
   end
 
@@ -84,8 +87,12 @@ describe 'GitReport::Commit' do
       data = JSON.parse(json_string)
 
       data.each_pair do |key, value|
+        next if key == "project"
         @commit.data[key.to_sym].should == value
       end
+      data["project"].each_pair do |key, value|
+        @commit.data[:project][key.to_sym].should == value
+      end
     end
   end
 

data/spec/models/project_spec.rb

@@ -79,10 +79,9 @@ describe 'GitReport::Project' do
     it 'should return the projects core data as a hash' do
       data = GitReport.project.data
       data.should be_a(Hash)
-      data.size.should == 7
-      data[:project_path].should    == GitReport.project.path
-      data[:project_name].should    == GitReport.project.name
-      data[:current_branch].should  == GitReport.project.branchname
+      data.size.should              == 6
+      data[:path].should            == GitReport.project.path
+      data[:name].should            == GitReport.project.name
       data[:remotes].should         == GitReport.project.remotes.map(&:name)
       data[:remote_urls].should     == GitReport.project.remotes.map(&:url)
       data[:remote_branches].should == GitReport.project.remote_branches

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitreport
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-28 00:00:00.000000000Z
+date: 2011-11-01 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70284346535700 !ruby/object:Gem::Requirement
+  requirement: &70131799697520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70284346535700
+  version_requirements: *70131799697520
 - !ruby/object:Gem::Dependency
   name: spork
-  requirement: &70284346531340 !ruby/object:Gem::Requirement
+  requirement: &70131799693860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>'
@@ -32,10 +32,10 @@ dependencies:
         version: 0.9.0.rc
   type: :development
   prerelease: false
-  version_requirements: *70284346531340
+  version_requirements: *70131799693860
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70284346525880 !ruby/object:Gem::Requirement
+  requirement: &70131799688280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70284346525880
+  version_requirements: *70131799688280
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70284346521540 !ruby/object:Gem::Requirement
+  requirement: &70131799684260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70284346521540
+  version_requirements: *70131799684260
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70284346518300 !ruby/object:Gem::Requirement
+  requirement: &70131799680940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70284346518300
+  version_requirements: *70131799680940
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70284346514400 !ruby/object:Gem::Requirement
+  requirement: &70131799676240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70284346514400
+  version_requirements: *70131799676240
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70284346510280 !ruby/object:Gem::Requirement
+  requirement: &70131799673080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70284346510280
+  version_requirements: *70131799673080
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70284346504540 !ruby/object:Gem::Requirement
+  requirement: &70131799667820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70284346504540
+  version_requirements: *70131799667820
 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
@@ -183,7 +183,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3923250588470254802
+      hash: -1624065190523425410
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: