timecost 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab1c4d27f50455f38f16e9a6713af684c5701096
-  data.tar.gz: 0e07a9b61f9346dac4a7ddbe46fe1b1af8783334
+  metadata.gz: 268ca3ddcacee98be7bff07b48509ef135622364
+  data.tar.gz: f31978fd381c22d21247a3d9c46da745b1d8b774
 SHA512:
-  metadata.gz: 27afa269a23c3f5d1724b186ad1d29284ef41f3bc7f35fa7ea2811359b21adba91defeba3628d6faa8e992190540f2387d1d171a45bfe22e750d7ab2e2c228f3
-  data.tar.gz: 6db3c9e39ae742a8bb8778c138a6d0e5e43efd88dd897287cf5021498af89d11f55263754eb5c5a46d604adca275e637cb9b8a23939f499d83cdde9872fa1b64
+  metadata.gz: cc0f16a139f4b84a5770e719f60a977433539f9e7fb6327753211ce9597430ff31e6a86771da5bfa13eb26b9d7713214bc639f61cfe8f940b65deda82f386cde
+  data.tar.gz: 4012b9fc5bd734604b01b9f5f5787cb67dbb4bfb10027b4479da95875e8416591fddb7a087e5e59612aa0910c519b411c955633fe4a747d73e55e533a392f119

data/.gitignore

@@ -1,6 +1,7 @@
 /.bundle/
+vendor/bundle
 /.yardoc
-/Gemfile.lock
+Gemfile.lock
 /_yardoc/
 /coverage/
 /doc/

data/Gemfile

@@ -1,5 +1,7 @@
 # A sample Gemfile
 source "https://rubygems.org"
 
+# gem "pry"
+
 # Specify your gem's dependencies in timecost.gemspec
 gemspec

data/README.md

@@ -8,7 +8,7 @@ Installation
 
 Install the project with:
 
-    $ gem install timecost
+    gem install timecost
 
 Usage
 -----
@@ -32,8 +32,8 @@ TOTAL: 3.36 hours
 To get the time spent on your project since a given date
 
 ```
-$ git timecost -d 2013-03-01
-set date filter to 2013-03-01
+$ git timecost --after 2013-03-01
+set date filter to >= 2013-03-01
 (1.0) 2013-09-23T13:02:39+02:00 - 2013-09-23T14:02:39+02:00
         * Glenn Y. Rolland <glenux@glenux.net>
           Add support for import / export / merge of ranges.
@@ -42,15 +42,16 @@ TOTAL: 1.00 hours
 ```
 
 For other possibilities
-```
-$ git timecost -h
-```
+
+    git timecost -h
+
 
 Contributing
 ------------
 
-1. Fork it ( https://github.com/[my-github-username]/timecost/fork )
+1. Fork it ( https://github.com/glenux/timecost/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create a new Pull Request
+

data/TODO.md

@@ -3,17 +3,44 @@ TODO
 
 Fixes and ideas for the future
 
+## Use an in-memory database
+
+The goal is to be able to keep associations & be able
+to make request on them, without having to maintain 
+various data structures.
+
+I imagine i could just use ActiveRecords for Ranges & Commit
+but i fear its the impact on the code. I would like to keep
+the codebase as clean as possible.
+
+
+## Merge users
+
+Set-up a config file, either global or per repository
+With id => names associations, so we can merge
+users who commit with various names/emails/etc
+
+    - name: "John Smith <john.smith@company.com>", 
+      match:
+        - "John S. <john@example.com>",
+        - "John Smith <john.s@example.com>",
+        - "J. Smith <smith@example.com>"
+    - name: "Foo Bar <foobar@company.com>",
+      match:
+        - "Foo B. <foobar@example.com>"
+        - "Foo Bar <foobar@company.com>"
+
+
 ## Per user scotch
 
 Different users have a different commit style & frequency.
 We should be able to define a per-user scotch.
 
+## Automatic scotch : Use median delay between consecutive commits, per user
 
-## Automatic scotch : Use median time between consecutive commits, per user
-
-	def median(array)
-  	  sorted = array.sort
-  	  len = sorted.length
-  	  return (sorted[(len - 1) / 2] + sorted[len / 2]) / 2.0
-	end
+    def median(array)
+      sorted = array.sort
+      len = sorted.length
+      return (sorted[(len - 1) / 2] + sorted[len / 2]) / 2.0
+    end
 

data/example.activerecord

@@ -0,0 +1,62 @@
+require 'active_record'
+ 
+ActiveRecord::Base.logger = Logger.new(STDERR)
+ActiveRecord::Base.colorize_logging = false
+ 
+ActiveRecord::Base.establish_connection(
+    :adapter => "sqlite3",
+    :dbfile  => ":memory:"
+)
+ 
+ActiveRecord::Schema.define do
+    create_table :albums do |table|
+        table.column :title, :string
+        table.column :performer, :string
+    end
+ 
+    create_table :tracks do |table|
+        table.column :album_id, :integer
+        table.column :track_number, :integer
+        table.column :title, :string
+    end
+end
+ 
+class Album < ActiveRecord::Base
+    has_many :tracks
+end
+ 
+class Track < ActiveRecord::Base
+    belongs_to :album
+end
+ 
+album = Album.create(:title => 'Black and Blue',
+    :performer => 'The Rolling Stones')
+album.tracks.create(:track_number => 1, :title => 'Hot Stuff')
+album.tracks.create(:track_number => 2, :title => 'Hand Of Fate')
+album.tracks.create(:track_number => 3, :title => 'Cherry Oh Baby ')
+album.tracks.create(:track_number => 4, :title => 'Memory Motel ')
+album.tracks.create(:track_number => 5, :title => 'Hey Negrita')
+album.tracks.create(:track_number => 6, :title => 'Fool To Cry')
+album.tracks.create(:track_number => 7, :title => 'Crazy Mama')
+album.tracks.create(:track_number => 8,
+    :title => 'Melody (Inspiration By Billy Preston)')
+ 
+album = Album.create(:title => 'Sticky Fingers',
+    :performer => 'The Rolling Stones')
+album.tracks.create(:track_number => 1, :title => 'Brown Sugar')
+album.tracks.create(:track_number => 2, :title => 'Sway')
+album.tracks.create(:track_number => 3, :title => 'Wild Horses')
+album.tracks.create(:track_number => 4,
+    :title => 'Can\'t You Hear Me Knocking')
+album.tracks.create(:track_number => 5, :title => 'You Gotta Move')
+album.tracks.create(:track_number => 6, :title => 'Bitch')
+album.tracks.create(:track_number => 7, :title => 'I Got The Blues')
+album.tracks.create(:track_number => 8, :title => 'Sister Morphine')
+album.tracks.create(:track_number => 9, :title => 'Dead Flowers')
+album.tracks.create(:track_number => 10, :title => 'Moonlight Mile')
+ 
+puts Album.find(1).tracks.length
+puts Album.find(2).tracks.length
+ 
+puts Album.find_by_title('Sticky Fingers').title
+puts Track.find_by_title('Fool To Cry').album_id

data/lib/timecost/cli.rb

@@ -174,12 +174,18 @@ module TimeCost
 
 		def analyze_dumps
 			#read ranges
-			@rangelist = RangeList.new
 
 			@config[:input_dump].each do |filename|
-				rangelist = YAML::load(File.open(filename,"r"))
-				rangelist.each do |range|
-					@rangelist.add range
+			  filelists = YAML::load(File.open(filename,"r"))
+				# require 'pry'
+				# binding.pry
+				filelists.each do |author, rangelist|
+				  # create list if author is new
+			    @rangelist[author] ||= RangeList.new
+
+				  rangelist.each do |range|
+					  @rangelist[author].add range
+					end
 				end
 			end
 		end

data/lib/timecost/environment.rb

@@ -0,0 +1,23 @@
+require 'active_record'
+ 
+ActiveRecord::Base.logger = Logger.new(STDERR)
+ActiveRecord::Base.colorize_logging = false
+ 
+ActiveRecord::Base.establish_connection(
+    :adapter => "sqlite3",
+    :dbfile  => ":memory:"
+)
+ 
+ActiveRecord::Schema.define do
+    create_table :albums do |table|
+        table.column :title, :string
+        table.column :performer, :string
+    end
+ 
+    create_table :tracks do |table|
+        table.column :album_id, :integer
+        table.column :track_number, :integer
+        table.column :title, :string
+    end
+end
+ 

data/lib/timecost/version.rb

@@ -1,3 +1,3 @@
 module Timecost
-  VERSION = "0.2.0"
+  VERSION = "0.2.2"
 end

data/timecost.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.add_runtime_dependency "activerecord", "~> 4.0"
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 4.7.5"

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: timecost
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Glenn Y. Rolland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-25 00:00:00.000000000 Z
+date: 2017-09-26 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -62,16 +76,17 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
 - TODO.md
 - bin/git-timecost
+- example.activerecord
 - lib/timecost.rb
 - lib/timecost/author_list.rb
 - lib/timecost/cli.rb
 - lib/timecost/commit.rb
+- lib/timecost/environment.rb
 - lib/timecost/range.rb
 - lib/timecost/range_list.rb
 - lib/timecost/version.rb
@@ -101,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Use GIT logs to give an estimation of spent time & costs of your projects.