mtm 1.0.1 → 1.0.2

data/README.md

@@ -18,7 +18,24 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+How to use this script?
+
+1. Opens your teminal and input:$: gem install mtm  
+
+2. Opens your teminal and input: tm -p 'Project name' -c 'Change name' -h 8 -d 'Tested some pages' -u bruce.yue:password
+   The default hours is 8 and default description is "Tested some pages and fixed some bugs."
+   If step 2 have been done, '-u' is not required in the step 3.
+   For example:
+   Project "CM Peak Development Requests", Its change is "Automate Upload of Build Records"
+   $: tm -p 'Peak Development' -c 'Build Records' -h 6 -d 'Added exception process logic.'
+
+  If there is no change. just paste  
+  
+  $: tm -p 'Peak Development' -h 6 -d 'Added exception process logic.'
+
+  Fill your time card at some time.
+  $: at 9pm today tm -p 'Peak Development' -h 6 -d 'Added exception process logic.'
+
 
 ## Contributing
 

data/lib/mtm/config.rb

@@ -0,0 +1,38 @@
+####################################################################################
+############################### start parse value ##################################
+####################################################################################
+# please fill these fields:                                                      ###
+SF_USERNAME = ''  # Salesforce user name                                         ###
+SF_PASSWORD = '' # Salesforce password                                           ###
+SF_SECURITY_TOKEN = '' # Salesforce password security token(option)              ###
+
+
+
+############ option ################
+SF_PROJECT = '' # project name
+SF_PROJECT_NUMBER = nil # project number #if Prj-07867, SF_PROJECT_NUMBER = 07867 
+SF_CHANGE = '' # change name
+SF_CHANGE_NUMBER = nil # change number
+SF_HOUR = 8   # time card hours
+SF_TIMECARD_DESCRIPTION = 'Tested some pages and fixed some bugs.'
+####################################################################################
+############################## end parse value #####################################
+####################################################################################
+
+=begin
+  How to use this script?
+  1. Opens your teminal and input:$: gem install mtm
+  2. Opens this file and paste your user name, password and sf_security_token.
+  3. Opens your teminal and input: tm -p 'Project name' -c 'Change name' -h 8 -d 'Tested some pages' -u bruce.yue:password
+     The default hours is 8 and default description is "Tested some pages and fixed some bugs."
+     If step 2 have been done, '-u' is not required in the step 3.
+     For example:
+     Project "Silver Peak Development Requests", Its change is "Automate Upload of Build Records"
+     $: tm -p 'Peak Development' -c 'Build Records' -h 6 -d 'Added exception process logic.'
+
+    If there is no change. just paste
+    $: tm -p 'Peak Development' -h 6 -d 'Added exception process logic.'
+
+    Fill your time card at some time.
+    $: at 9pm today tm -p 'Peak Development' -h 6 -d 'Added exception process logic.'
+=end

data/lib/mtm/mtm.rb

@@ -1,83 +1,38 @@
-####################################################################################
-############################### start parse value ##################################
-####################################################################################
-# please fill these fields:                                                      ###
-sf_username = ''  # Salesforce user name                                         ###
-sf_password = '' # Salesforce password                                           ###
-sf_security_token = '' # Salesforce password security token(option)              ###
-####################################################################################
-############################## end parse value #####################################
-####################################################################################
-
-=begin
-  How to use this script?
-  0. Opens your teminal and input:$: gem install restforce
-                                  $: gem install ruby-progressbar
-
-  1. Puts this file to '/usr/bin' folder
-     $: cd /user/bin
-     $: chmod 755 tm
-  2. Opens this file and paste your user name and password.
-  3. Opens your teminal and input: tm -p 'Project name' -c 'Change name' -h 8 -d 'Tested some pages' -u bruce.yue:password
-     The default hours is 8 and default description is "Tested some pages and fixed some bugs."
-     If step 2 have been done, '-u' is not required in the step 3.
-     For example:
-     Project "Silver Peak Development Requests", Its change is "Automate Upload of Build Records"
-     $: tm -p 'Peak Development' -c 'Build Records' -h 6 -d 'Added exception process logic.'
-
-    If there is no change. just paste
-    $: tm -p 'Peak Development' -h 6 -d 'Added exception process logic.'
-
-    Fill your time card at some time.
-    $: at 9pm today tm -p 'Peak Development' -h 6 -d 'Added exception process logic.'
-=end
-
-# salesforce remote app client id
-sf_client_id = '3MVG9Y6d_Btp4xp6SWO6yPlUURnycVbOfuH7I_NH2bjaw0yeoguRatNzKRpEVaIvmX7TcQbVVjuQUCZ006pwN'
-sf_client_secret = '5339957415407001741' # salesforce remote app client secret
-user_name_suffix = '@pm.meginfo.com'
-sf_project = '' # project name
-sf_project_number = nil # project number
-sf_change = '' # change name
-sf_change_number = nil # change number
-sf_hour = 8   # time card hours
-
+$LOAD_PATH.unshift(File.dirname(__FILE__)) unless $LOAD_PATH.include?(File.dirname(__FILE__))
 require 'rubygems'
 require 'restforce' # gem install restforce
 require 'optparse/date'
 require 'ruby-progressbar'
+require 'utils'
+require 'config'
 
 @pb = ProgressBar.create(:title => 'Logging', :starting_at => 0, :total => 100, :progress_mark => '*', :format => '%w %%')
 
-# for date format argv
-def parse_days_or_date(d)
-    if d.to_s =~ /^\d+$/
-    d.to_i
-  else
-    Date.parse(d)
-  end
-end
-
 # Parse arguments
 options = {}
-options[:user_name] = sf_username
-options[:password] = sf_password
-options[:security_token] = sf_security_token
+options[:user_name] = SF_USERNAME
+options[:password] = SF_PASSWORD
+options[:security_token] = SF_SECURITY_TOKEN
 options[:test] = false
 options[:host] = 'login.salesforce.com'
 options[:tm_list] = false
-options[:tm_project] = sf_project
-options[:tm_p_number] = sf_project_number
-options[:tm_change] = sf_change
-options[:tm_c_number] = sf_change_number
-options[:tm_hour] = sf_hour
+options[:tm_project] = SF_PROJECT
+options[:tm_p_number] = SF_PROJECT_NUMBER
+options[:tm_change] = SF_CHANGE
+options[:tm_c_number] = SF_CHANGE_NUMBER
+options[:tm_hour] = SF_HOUR
 options[:tm_date] = DateTime.now.to_date
-options[:tm_description] = 'Tested some pages and fixed some bugs.'
+options[:tm_description] = SF_TIMECARD_DESCRIPTION
+
+# salesforce remote app client id
+sf_client_id = '3MVG9Y6d_Btp4xp6SWO6yPlUURnycVbOfuH7I_NH2bjaw0yeoguRatNzKRpEVaIvmX7TcQbVVjuQUCZ006pwN'
+sf_client_secret = '5339957415407001741' # salesforce remote app client secret
+user_name_suffix = '@pm.meginfo.com'
 
 op = OptionParser.new do |opts|
   opts.banner = <<-BANNER
     Timecard Solution
-    Usage: tm -p project -c change -h 6 -d 'Added exception process logic.'
+    Usage: mtm -p project -c change -h 6 -d 'Added exception process logic.'
   BANNER
   opts.separator ''
 
@@ -121,7 +76,7 @@ op = OptionParser.new do |opts|
   end
 
   opts.on("-d", "--date YYYY-MM-DD", "Timecard Date, default: TODAY", "Enter date in (YYYY-MM-DD) format.") do |d|
-    options[:tm_date] = parse_days_or_date(d)
+    options[:tm_date] = Mtm.parse_days_or_date(d)
   end
 
   opts.on("-e Description", "Timecard detail information, describle today's work.") do |desc|
@@ -139,17 +94,19 @@ if ARGV.size < 1
   puts op
   exit
 end
+
 40.times { sleep(0.05); @pb.increment }
+
 # login to salesforce.com
 begin
-  @client = Restforce.new :client_id => sf_client_id,
+  client = Restforce.new :client_id => sf_client_id,
                           :client_secret => sf_client_secret,
                           :username => options[:user_name],
                           :password => options[:password],
                           :security_token => options[:security_token],
                           :host => options[:host]
-  response = @client.authenticate!
-  info = @client.get(response.id).body
+  response = client.authenticate!
+  info = client.get(response.id).body
   @sf_user_id = info.user_id
 rescue Exception => e
   puts e.message
@@ -159,7 +116,7 @@ end
 # list all projects and its changes
 if options[:tm_list]
   40.times { sleep(0.05); @pb.increment }
-  projects = @client.query("select Id, Name, ProjectNumber__c, (select Id, Name, ChangeNumber__c from Changes__r
+  projects = client.query("select Id, Name, ProjectNumber__c, (select Id, Name, ChangeNumber__c from Changes__r
                                     where Status__c != 'Closed') from MProject__c where Status__c != 'Closed'")
   projects.each do |p|
     puts
@@ -175,8 +132,8 @@ if options[:tm_list]
 end
 
 # Creates time card
-def create_timecard(*args)
-  @tm = @client.create!('TimeCard__c', Project__c: args[0],
+def create_timecard(*args, client)
+  @tm = client.create!('TimeCard__c', Project__c: args[0],
                                        Change__c: args[1],
                                        Date__c: args[2],
                                        Hours__c: args[3],
@@ -189,14 +146,14 @@ end
 msg = 'Project not found'
 begin
   if options[:tm_project] != ''
-    projects = @client.query("select Id, Name, (select Id, Name from Changes__r where Status__c != 'Closed' and
+    projects = client.query("select Id, Name, (select Id, Name from Changes__r where Status__c != 'Closed' and
                             Name like '%#{options[:tm_change]}%') from MProject__c where Status__c != 'Closed'
                             and Name like '%#{options[:tm_project]}%'")
-  end
-  if options[:tm_p_number] != nil
-    projects = @client.query("select Id, Name, (select Id, Name from Changes__r where Status__c != 'Closed'
+  elsif options[:tm_p_number] != nil
+    p_number = 'Prj-' << options[:tm_p_number]
+    projects = client.query("select Id, Name, (select Id, Name from Changes__r where Status__c != 'Closed'
                               and ChangeNumber__c = '#{options[:tm_c_number]}')
-                              from MProject__c where Status__c != 'Closed' and ProjectNumber__c = '#{options[:tm_p_number]}'")
+                              from MProject__c where Status__c != 'Closed' and ProjectNumber__c = '#{p_number}'")
   end
   30.times { sleep(0.05); @pb.increment }
 rescue Exception => e
@@ -217,15 +174,15 @@ end
 
 begin
   if projects.size == 1
-    team_member = @client.query("select Id from TeamMember__c where Project__c = '#{projects.first.Id}' and User__c = '#{@sf_user_id}'");
+    team_member = client.query("select Id from TeamMember__c where Project__c = '#{projects.first.Id}' and User__c = '#{@sf_user_id}'");
     if(options[:tm_change] == '' && options[:tm_c_number] == nil)
       create_timecard(projects.first.Id, nil, options[:tm_date], options[:tm_hour],
-                      team_member.first.Id, options[:tm_description], projects.first.Name)
+                      team_member.first.Id, options[:tm_description], projects.first.Name, client)
     else
       if (projects.first.Changes__r != nil && projects.first.Changes__r.size == 1)
         create_timecard(projects.first.Id, projects.first.Changes__r.first.Id,
                         options[:tm_date], options[:tm_hour], team_member.first.Id,
-                        options[:tm_description], projects.first.Name)
+                        options[:tm_description], projects.first.Name, client)
       elsif projects.first.Changes__r == nil
         puts
         puts 'No change found.'

data/lib/mtm/utils.rb

@@ -0,0 +1,13 @@
+module Mtm
+  extend self
+
+  # for date format argv
+  def parse_days_or_date(d)
+      if d.to_s =~ /^\d+$/
+      d.to_i
+    else
+      Date.parse(d)
+    end
+  end
+
+end

data/lib/mtm/version.rb

@@ -1,3 +1,3 @@
 module Mtm
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/lib/mtm.rb

@@ -1,7 +1,7 @@
 require "mtm/version"
 
 module Mtm
-  class Tm
+  class Mtm
     def log_timecard
       puts 'Please log your timecard on time.'
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mtm
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ autorequire:
 bindir:
 - bin
 cert_chain: []
-date: 2013-03-26 00:00:00.000000000 Z
+date: 2013-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: restforce
@@ -19,7 +19,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,7 +27,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
@@ -35,7 +35,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.2
 description: Timecard solution
 email:
 - bruce.yue@outlook.com
@@ -52,7 +52,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/mtm/config.rb
 - lib/mtm/mtm.rb
+- lib/mtm/utils.rb
 - lib/mtm/version.rb
 - lib/mtm.rb
 - README.md