mm 0.2.0 → 0.2.1

data/Rakefile

@@ -0,0 +1,9 @@
+require 'rake'
+
+require 'rubygems/package_task'
+
+spec = Gem::Specification.load "mm.gemspec"
+Gem::PackageTask.new(spec) do |pkg|
+  pkg.need_zip = true
+  pkg.need_tar = true
+end

data/lib/turbine.rb

@@ -1,5 +1,9 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 
+module Turbine
+  PRECISION = 2 # decimal places for rounding
+end
+
 require "turbine/timer"
 require "turbine/queue"
 require "turbine/commands/init"

data/lib/turbine/application.rb

@@ -17,6 +17,13 @@ module Turbine
         end
       end
 
+      def global_config_dir
+        path = File.expand_path("~/.turbine")
+        if File.exist?(path)
+          path
+        end
+      end
+
       def extensions
         @extensions ||= []
       end

data/lib/turbine/command_runner.rb

@@ -7,12 +7,16 @@ module Turbine
       init_and_exit(*argv) if argv[0] == "init"
 
       unless self.class.config_dir
-        prompt.say "Cannot find config file.  Did you forget to run turbine init?"
+        prompt.say "Cannot find config file.  Did you forget to run mm init?"
         return
       end
 
       require "#{self.class.config_dir}/config"
 
+      if self.class.global_config_dir
+        Dir["#{self.class.global_config_dir}/commands/*.rb"].each { |f| load f }
+      end
+
       self.class.extensions.each do |extension|
         extend(extension)
       end
@@ -20,13 +24,13 @@ module Turbine
       setup
       parse_options(*argv)
 
-      if respond_to?(command) 
+      if command && respond_to?(command)
         send(command)
       else 
         prompt.say("Unknown command: #{command}")
       end
 
-       teardown
+      teardown
     end
 
     def init_and_exit(*argv)

data/lib/turbine/commands/init.rb

@@ -6,7 +6,21 @@ module Turbine
   module StandardCommands
     include FileUtils
 
+    def setup
+      option_parser.on("--update", "Update") do
+        params[:update] = true
+      end
+    end
+
     def init
+      current_dir = File.dirname(__FILE__)
+
+      if params[:update] == true
+        update_standard_commands(current_dir)
+        prompt.say "Standard commands updated"
+        return
+      end
+
       mkdir_p(".turbine")
       mkdir_p(".turbine/log")
       mkdir_p(".turbine/commands")
@@ -17,8 +31,7 @@ module Turbine
       project_name = params[:arguments][1] || "default"
 
       raise if key.nil?
-      
-      current_dir = File.dirname(__FILE__)
+
 
       write_file("log/#{key}.json") { |f| f << [].to_json }
 
@@ -35,8 +48,14 @@ module Turbine
        f << { project_name => url }.to_json
       end
 
-      cp_r("#{current_dir}/standard", 
-           "#{self.class.config_dir}/commands/")
+      update_standard_commands(current_dir)
+    end
+
+    private
+
+    def update_standard_commands(current_dir)
+      cp_r("#{current_dir}/standard",
+        "#{self.class.config_dir}/commands/")
     end
   end
-end      
+end

data/lib/turbine/commands/standard/commit.rb

@@ -1,6 +1,11 @@
+require 'tempfile'
+require 'shellwords'
+
 Turbine::Application.extension do
   def commit
-    if message = params[:message]
+    message = params[:message] || message_from_editor
+
+    if message && message != ""
       queue      = Turbine::Queue.new
       duration   = queue.sum.to_s
       timestamp  = Time.now.utc.to_s
@@ -26,4 +31,24 @@ Turbine::Application.extension do
       prompt.say "You need to supply a message"
     end
   end
+
+  private
+
+  # Private launch the default editor to capture a commit message
+  #
+  # Uses the environment variable +MM_EDITOR+ if present, otherwise falls back
+  # to the default +EDITOR+ variable
+  #
+  # Returns text saved to the temp file
+  def message_from_editor
+    editor = ENV['MM_EDITOR'] || ENV['EDITOR']
+
+    return unless editor
+
+    Tempfile.open('commit.txt') do |file|
+      editor_invocation = "#{editor} #{file.path}"
+      system(*Shellwords.split(editor_invocation))
+      message = File.read(file.path)
+    end
+  end
 end

data/lib/turbine/commands/standard/status.rb

@@ -1,12 +1,13 @@
-Turbine::Application.extension do 
+Turbine::Application.extension do
   def status
     queue = Turbine::Queue.new
-    
+
     if queue.empty?
       prompt.say "No entries for this commit yet\n\n"
     else
       entries = queue.entries.join(", ")
-      sum     = queue.entries.inject {|sum, n| sum + n }
+      sum     = queue.entries.inject {|sum, n| sum + n }.
+        round(Turbine::PRECISION)
       prompt.say "Entries for this commit: ( #{entries} )"
       prompt.say "Total for this commit: #{sum}\n\n"
     end

data/lib/turbine/queue.rb

@@ -1,5 +1,5 @@
 module Turbine
-  class Queue 
+  class Queue
     include Enumerable
 
     def initialize(dir=Turbine::Application.config_dir)
@@ -18,7 +18,7 @@ module Turbine
     def entries
       return [] if empty?
 
-      File.read(@file).split("\n").map { |e| e.to_f }
+      File.read(@file).split("\n").map { |e| e.to_f.round(Turbine::PRECISION) }
     end
 
     def each
@@ -30,7 +30,7 @@ module Turbine
 
       File.foreach(@file).inject(0) do |sum, line|
         sum + line.to_f
-      end
+      end.round(Turbine::PRECISION)
     end
 
     def clear

data/lib/turbine/timer.rb

@@ -13,14 +13,14 @@ module Turbine
     def write_timestamp
       File.open(@file, "w") { |f| f << Time.now.utc.to_s }
     end
-    
+
     def timestamp
       raise MissingTimestampError unless running?
       Time.parse(File.read(@file)).localtime
     end
-    
+
     def elapsed_time
-      (Time.now.utc - timestamp.utc) / 60.0 / 60.0
+      ((Time.now.utc - timestamp.utc) / 60.0 / 60.0).round(Turbine::PRECISION)
     end
 
     def clear_timestamp
@@ -30,6 +30,6 @@ module Turbine
     def running?
       File.exist?(@file)
     end
-  end 
+  end
 end
 

metadata

@@ -1,86 +1,70 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: mm
-version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 0
-  version: 0.2.0
+version: !ruby/object:Gem::Version
+  version: 0.2.1
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Gregory Brown
+- Jordan Byron
+- Brad Ediger
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-08-10 00:00:00 -04:00
-default_executable: 
+date: 2013-08-21 00:00:00.000000000 Z
 dependencies: []
-
-description: "  Seeekrit\n"
-email: "  gregory.t.brown@gmail.com"
-executables: 
+description: CLI for Madriska Momentum
+email:
+- gregory.t.brown@gmail.com
+- jordan.byron@gmail.com
+- brad@bradedier.com
+executables:
 - mm
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/turbine/application.rb
 - lib/turbine/command_runner.rb
-- lib/turbine/timer.rb
-- lib/turbine/queue.rb
-- lib/turbine/commands/standard/staged.rb
-- lib/turbine/commands/standard/start.rb
+- lib/turbine/commands/init.rb
 - lib/turbine/commands/standard/add.rb
-- lib/turbine/commands/standard/reset.rb
+- lib/turbine/commands/standard/commit.rb
 - lib/turbine/commands/standard/drop.rb
-- lib/turbine/commands/standard/status.rb
+- lib/turbine/commands/standard/project.rb
 - lib/turbine/commands/standard/push.rb
+- lib/turbine/commands/standard/reset.rb
 - lib/turbine/commands/standard/rewind.rb
-- lib/turbine/commands/standard/project.rb
-- lib/turbine/commands/standard/commit.rb
+- lib/turbine/commands/standard/staged.rb
+- lib/turbine/commands/standard/start.rb
+- lib/turbine/commands/standard/status.rb
 - lib/turbine/commands/standard/stop.rb
-- lib/turbine/commands/init.rb
+- lib/turbine/queue.rb
+- lib/turbine/timer.rb
 - lib/turbine.rb
 - data/config.rb.erb
 - bin/mm
 - Rakefile
-has_rdoc: true
-homepage: http://pixelpowerhouse.com
+homepage: http://momentum.madriska.com
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: A seecret
+summary: CLI for Madriska Momentum
 test_files: []
-