mm 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c4ffe0f3b812f6e0c9c94de543b24fb5d452acd
-  data.tar.gz: d0e8454697b490acad7bfb32630aa38278afec12
+  metadata.gz: fe8563d98296fa20a0e4a6288d6d6019cadbc0a7
+  data.tar.gz: 13f5d55ed96576c46c91f7917e4f3bb4bec23e7c
 SHA512:
-  metadata.gz: 69d12260024c9ca22e2b3bdad13d64695e8bb5f8c82d0df2f9b4496bc8d92842b971171cb57fc42cd4bdb650506cd74300b27eaf6d5ceef421b4aff95dd5cd21
-  data.tar.gz: 8ff650a3d08ea5933b9e50bcda6a9c092fd7ff958335a66216daf86ca41127d209b09f85ab6cfaf31c14328be662967027e66073b8878c7312acf8b900e395c3
+  metadata.gz: 6ed6865e5379779c2bc39182ed1293760dd0a77318742f8761412f922d277a2b9df858ede3c8a16a2f878e41be031c6d46e9c8b015b8794862dbf2bf0fdbcd1f
+  data.tar.gz: 0704d00be644cb1fe421358bb0c39c156277d60f4d3bc14062afebe1a45cb42e23d5aced3f9826a3f64132ac708b26d15ab8719edc2d84fe8d3c54b0bb084153

data/bin/mm

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
 require "rubygems"
-require "#{File.dirname(__FILE__)}/../lib/turbine"
+require File.expand_path(File.join(File.dirname(__FILE__), "../lib/turbine"))
 
 Turbine::Application.new.run(ARGV.map { |e| e.dup })

data/lib/turbine.rb

@@ -4,6 +4,7 @@ module Turbine
   PRECISION = 2 # decimal places for rounding
 end
 
+require "turbine/version"
 require "turbine/timer"
 require "turbine/queue"
 require "turbine/commands/init"

data/lib/turbine/application.rb

@@ -2,6 +2,7 @@ require "pathname"
 require "highline"
 require "restclient"
 require "json"
+require "rainbow"
 
 module Turbine
   class Application
@@ -59,7 +60,8 @@ module Turbine
     end
 
     def read_file(name)
-      File.read("#{self.class.config_dir}/#{name}")
+      file = "#{self.class.config_dir}/#{name}"
+      File.read(file) if File.exists?(file)
     end
 
     def write_file(name, mode="w")

data/lib/turbine/command_runner.rb

@@ -1,6 +1,14 @@
 module Turbine
   module CommandRunner
     def setup
+      version = read_file("VERSION")
+      if version.nil? || version != Turbine::VERSION
+        if prompt.agree(Rainbow("The project's momentum configuration is out of date.").red +
+          " Would you like to update it?\nWARNING This will overwrite any custom changes made to standard mm commands in this project's `.turbine` folder.", true)
+          update_version
+          update_standard_commands
+        end
+      end
     end
 
     def run(argv)
@@ -26,7 +34,7 @@ module Turbine
 
       if command && respond_to?(command)
         send(command)
-      else 
+      else
         prompt.say("Unknown command: #{command}")
       end
 
@@ -64,4 +72,4 @@ module Turbine
     end
   end
 end
- 
+

data/lib/turbine/commands/init.rb

@@ -6,21 +6,9 @@ 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")
@@ -32,9 +20,9 @@ module Turbine
 
       raise if key.nil?
 
-
       write_file("log/#{key}.json") { |f| f << [].to_json }
 
+
       write_file("config.rb") do |f|
         template    = File.read("#{current_dir}/../../../data/config.rb.erb")
         f << ERB.new(template).result(binding)
@@ -48,14 +36,21 @@ module Turbine
        f << { project_name => url }.to_json
       end
 
-      update_standard_commands(current_dir)
+      update_standard_commands
+      update_version
     end
 
     private
 
-    def update_standard_commands(current_dir)
+    def update_standard_commands
+      current_dir = File.dirname(__FILE__)
+
       cp_r("#{current_dir}/standard",
         "#{self.class.config_dir}/commands/")
     end
+
+    def update_version
+      write_file("VERSION") { |f| f << Turbine::VERSION }
+    end
   end
 end

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

@@ -2,10 +2,11 @@ Turbine::Application.extension do
   def start
     timer = Turbine::Timer.new
     if timer.running?
-      prompt.say "Timer already started, please stop or rewind first"
+      prompt.say Rainbow("WARNING:").red +
+        " Timer already started, please stop or rewind first"
     else
       timer.write_timestamp
-      prompt.say "Timer started at #{Time.now}"
+      prompt.say Rainbow("Timer started at #{Time.now}").green
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mm
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Gregory Brown
@@ -10,48 +10,48 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-16 00:00:00.000000000 Z
+date: 2015-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.20
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.20
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.7.2
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: CLI for Madriska Momentum
@@ -93,12 +93,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []