gitme_time 0.0.7 → 0.1.0

data/README.md

@@ -13,8 +13,11 @@ If you specify a number between square brackets in your commit message, it will
 
 # Installation
 
-```
-    gem install gitme_time
+Require it inside your project Gemfile:
+```ruby
+    group :development do
+      gem 'gitme_time', '~> 0.1.0'
+    end
 ```
 
 # Configuration
@@ -33,16 +36,14 @@ Then, inside your project, launch gitme_time init to configure your project:
     gitme_time init
 ```
 
-As a final step, add a hook to your git repository:
+This will create the project config file if not exist and will add a git post-commit hook.
+Upon each commit, the hook will send your data to the configured basecamp domain.
 
-```
-    cd /path/to/git/project
-    ln -sf `which gitme_time` ./.git/hooks/post-commit
-```
+Note: remember to add the project config file (.gitme_time.yml) to the git repo, so all your teammates will log the entries inside the same domain/project
 
 # TODO
 
-- Specs!
+- Specs! I had no time to write them.
 
 # Get ready to contribute!
 

data/bin/gitme_time

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+require 'rubygems'
 require 'gitme_time'
 require 'gitme_time/cli'
 

data/lib/gitme_time/cli/init_tutorial.rb

@@ -1,66 +1,135 @@
 module GitmeTime
   module CLI
     module InitTutorial
-      def self.create_project_config_file
-        if GitmeTime::Config.project_data?
-          puts "Project config file already exists (#{GitmeTime::Config.project_config_file}). Skipping ..."
-        else
-          puts "Generating Project config file ..."
-          File.open Config.project_config_file, 'w' do |f|
-            f.write({ 'domain' => get_domain, 'project_id' => get_project }.to_yaml)
+      class << self
+        def create_project_config_file
+          generate_project_config_file
+          generate_git_hook
+        end
+
+        def generate_git_hook
+          if File.file? Config.project_hook_file
+            hook_content = File.open(Config.project_hook_file).read
+            if hook_content =~ /GitmeTime/
+              version = hook_content.match(/GitmeTime (.+)\.$/)[1]
+              if version == GitmeTime::VERSION
+                puts 'Git post-commit hook already exists and is updated. Skipping ...'
+              else
+                File.delete Config.project_hook_file
+                write_hook_file
+                puts 'Generated an updated Git post-commit hook'
+              end
+            else
+              puts 'Git post-commit hook already exists but it has not been generated by GitmeTime. What I have to do ?'
+              option = nil
+              while option.nil?
+                print '[O]verwrite/[S]kip/Show [C]ontent ? '
+                option = STDIN.gets.chomp.downcase
+                if option == 'i'
+                  puts 'Skipping Git post-commit hook generation...'
+                  break
+                elsif option == 'o'
+                  File.delete Config.project_hook_file
+                  write_hook_file
+                elsif option == 'c'
+                  puts
+                  puts hook_content
+                  puts
+                  option = nil
+                else
+                  option = nil
+                  puts 'Invalid Option. Allowed choices are:'
+                end
+              end
+            end
+          else
+            write_hook_file
+            puts 'Generated the Git post-commit hook'
           end
-          puts "Project config file generated!"
+          puts 'Init Completed!'
         end
-        puts "Remember to add the git hook like in the following way:"
-        puts "\tln -s `which gitme_time` ./.git/hooks/post-commit"
-      end
 
-      private
+        def write_hook_file
+          File.open Config.project_hook_file, 'w' do |f|
+            f.write <<-FILE
+#!/usr/bin/env ruby
+#
+# This file was generated by GitmeTime #{GitmeTime::VERSION}.
+# For more informations, see https://github.com/mikamai/gitme_time
 
-      def self.get_project
-        projects = Basecamp::Project.all
-        puts "\tChoose a project from one of the following:"
-        projects.each_with_index do |project, index|
-          puts "\t\t#{index + 1} - #{project.name}"
-        end
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
 
-        project_id = nil
-        while project_id.nil?
-          puts
-          print "\tProject (e.g. 1): "
-          project_index = STDIN.gets.chomp
-          if project_index.empty?
-            puts "\t\tProject is required!"
-            project_index = nil
-          elsif project_index.to_i < 1 || project_index.to_i > projects.length
-            puts "\t\tA project index between 1 and #{projects.count} is required!"
-            project_index = nil
+load Gem.bin_path('gitme_time', 'gitme_time')
+            FILE
           end
-          project_id = projects[project_index.to_i - 1].id if project_index.present?
+          File.chmod 0755, Config.project_hook_file
+          puts "Git post-commit hook successfully created in #{Config.project_hook_file}"
         end
-        project_id.to_i
-      end
 
-      def self.get_domain
-        domain = nil
-        while domain.nil?
-          puts
-          print "\tBasecamp Domain (e.g. company.basecamphq.com): "
-          domain = STDIN.gets.chomp
-          if domain.empty?
-            puts "\t\tBasecamp Domain is required!"
-            domain = nil
+        def generate_project_config_file
+          if GitmeTime::Config.project_data?
+            puts "Project config file already exists (#{GitmeTime::Config.project_config_file}). Skipping ..."
           else
-            begin
-              GitmeTime.connect! :domain => domain
-              Basecamp::Person.me # connection test
-            rescue SocketError
-              puts "\t\tCannot connect to https://#{domain} !"
+            puts "Generating Project config file ..."
+            File.open Config.project_config_file, 'w' do |f|
+              f.write({ 'domain' => get_domain, 'project_id' => get_project }.to_yaml)
+            end
+            puts "Project config file generated!"
+          end
+        end
+
+        private
+
+        def get_project
+          projects = Basecamp::Project.all
+          puts "\tChoose a project from one of the following:"
+          projects.each_with_index do |project, index|
+            puts "\t\t#{index + 1} - #{project.name}"
+          end
+
+          project_id = nil
+          while project_id.nil?
+            puts
+            print "\tProject (e.g. 1): "
+            project_index = STDIN.gets.chomp
+            if project_index.empty?
+              puts "\t\tProject is required!"
+              project_index = nil
+            elsif project_index.to_i < 1 || project_index.to_i > projects.length
+              puts "\t\tA project index between 1 and #{projects.count} is required!"
+              project_index = nil
+            end
+            project_id = projects[project_index.to_i - 1].id if project_index.present?
+          end
+          project_id.to_i
+        end
+
+        def get_domain
+          domain = nil
+          while domain.nil?
+            puts
+            print "\tBasecamp Domain (e.g. company.basecamphq.com): "
+            domain = STDIN.gets.chomp
+            if domain.empty?
+              puts "\t\tBasecamp Domain is required!"
               domain = nil
+            else
+              begin
+                GitmeTime.connect! :domain => domain
+                Basecamp::Person.me # connection test
+              rescue SocketError
+                puts "\t\tCannot connect to https://#{domain} !"
+                domain = nil
+              end
             end
           end
+          domain
         end
-        domain
       end
     end
   end

data/lib/gitme_time/config.rb

@@ -35,6 +35,10 @@ module GitmeTime
         File.join project_directory, '.gitme_time.yml'
       end
 
+      def project_hook_file
+        File.expand_path '../.git/hooks/post-commit', Config.project_config_file
+      end
+
       private
 
       def project_data

data/lib/gitme_time/version.rb

@@ -1,3 +1,3 @@
 module GitmeTime
-  VERSION = '0.0.7'
+  VERSION = '0.1.0'
 end

data/lib/gitme_time.rb

@@ -15,7 +15,7 @@ module GitmeTime
       message = commit.message
       hours = 0
     end
-    message << " (#{current_branch} : #{commit.sha[0,6]})"
+    message << " [#{current_branch} #{commit.sha[0,6]}]"
     create_entry message, :hours => hours
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitme_time
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -161,18 +161,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1756184393276805927
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1756184393276805927
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24