muto 0.0.1 → 0.0.2

data/README.textile

@@ -19,24 +19,28 @@ h2. Example Usage
 #From the command line
 
 muto
-=>Expected format:  muto [ruby_version]
-=>
-=>Available Versions are:
-=>  186  ruby 1.8.6 (2007-09-24 patchlevel 111) [i386-mswin32]
-=>  192  ruby 1.9.2p180 (2011-02-18) [i386-mingw32]
-=>
-=>Currently using:
-=>ruby 1.8.6 (2007-09-24 patchlevel 111) [i386-mswin32]
+  =>Expected format:  muto [ruby_version]
+  =>
+  =>Available Versions are:
+  =>  186  ruby 1.8.6 (2007-09-24 patchlevel 111) [i386-mswin32]
+  =>  192  ruby 1.9.2p180 (2011-02-18) [i386-mingw32]
+  =>
+  =>Currently using:
+  =>ruby 1.8.6 (2007-09-24 patchlevel 111) [i386-mswin32]
 
 ruby -v
-=>ruby 1.8.6 (2007-09-24 patchlevel 111) [i386-mswin32]
+  =>ruby 1.8.6 (2007-09-24 patchlevel 111) [i386-mswin32]
+echo %JAVA_HOME%
+  =>C:\Program Files\Java\jre5
 
 muto 192
-=>System updated. Now using:
-=>ruby 1.9.2p180 (2011-02-18) [i386-mingw32]
+  =>System updated. Now using:
+  =>ruby 1.9.2p180 (2011-02-18) [i386-mingw32]
 
 ruby -v
-=>ruby 1.9.2p180 (2011-02-18) [i386-mingw32]
+  =>ruby 1.9.2p180 (2011-02-18) [i386-mingw32]
+echo %JAVA_HOME%
+  =>C:\Program Files\Java\jre7
 </pre>
 
 h2. How Muto works..
@@ -67,7 +71,6 @@ extract_muto
 #=>Then add C:\Muto to your Windows PATH environment variable and you're good to go
 </pre>
 
-
 h3. ruby_versions.yml
 
 As well as being able to switch to other versions of Ruby in your Windows environment, you can also define other User Environment Variables to change at
@@ -84,20 +87,11 @@ ruby_versions:
   ruby_186:
     shortcut: 186
     bin_folder: C:\ruby\bin
+    user_env_variables:
+      java_home: C:\Program Files\Java\jre5
   ruby_192:
     shortcut: 192
     bin_folder: C:\ruby192\bin
-
-  jruby_164_jre6:
-    shortcut: jr_j6
-    bin_folder: C:\jruby-1.6.4\bin
-    exe_name: jruby.exe
-    user_env_variables:
-      java_home: C:\Program Files\Java\jre6
-  jruby_164_jre7:
-    shortcut: jr_j7
-    bin_folder: C:\jruby-1.6.4\bin
-    exe_name: jruby.exe
     user_env_variables:
       java_home: C:\Program Files\Java\jre7
 

data/bin/extract_muto

@@ -24,14 +24,20 @@ class Muto
 
       Dir[templates].each do |source|
 
-        next if source.match(/muto.bat\z/) #ignore muto.bat here, going to write it next
+        next if source.match(/muto.bat\z/) #ignore muto.bat here, going to write it manually next
 
         destination = File.join(muto_root_dir, source.gsub(/^.*\/deploy_scripts/, ''))
-        if File.exist?(destination) || (File.directory? destination)
-          puts "Skipping #{destination.to_s.gsub(/\//, '\\')} because it already exists"
+        if File.exist?(destination) && destination.match(/ruby_versions\.yml/)
+          puts "Leaving #{destination.to_s.gsub(/\//, '\\')} because a copy already exists"
         else
-          puts "Generating #{destination.to_s.gsub(/\//, '\\')}"
-          File.directory?(source) ? FileUtils.mkdir(destination) : FileUtils.cp(source, destination)
+          if File.exist?(destination)
+            puts "Replacing #{destination.to_s.gsub(/\//, '\\')}"
+            FileUtils.rm_rf(destination)
+            FileUtils.cp(source, destination)
+          else
+            puts "Generating #{destination.to_s.gsub(/\//, '\\')}"
+            File.directory?(source) ? FileUtils.mkdir(destination) : FileUtils.cp(source, destination)
+          end
         end
       end
 
@@ -57,7 +63,7 @@ class Muto
       end
 
       puts "\nAdd Ruby versions to your #{muto_root_dir.to_s.gsub(/\//, '\\')}\\ruby_versions.yml"
-      puts "Then add #{muto_root_dir.to_s.gsub(/\//, '\\')} to your Windows PATH environment variable and you're good to go"
+      puts "Then add #{muto_root_dir.to_s.gsub(/\//, '\\')} to your User PATH environment variable and you're good to go"
 
     rescue
       puts $!, $!.backtrace

data/lib/deploy_scripts/muto.rb

@@ -108,7 +108,13 @@ class Muto
   end
 
   def update_user_path_variable(versions_yml_key)
-    reg_key, path_env_var = Win32::Registry::HKEY_CURRENT_USER.open('Environment').read('PATH')
+
+    begin
+      reg_key, path_env_var = Win32::Registry::HKEY_CURRENT_USER.open('Environment').read('PATH')
+    rescue
+      user_path_env_not_set_properly_msg
+      exit!
+    end
 
     #TODO - Fix regex to support all variants of path names
     @all_bin_paths.each do |bin_path|
@@ -128,7 +134,17 @@ class Muto
     end
 
     broadcast_WM_SETTINGCHANGE_signal
+  end
+
+private
 
+  def user_path_env_not_set_properly_msg
+    puts "\nThere are no User environment variables named PATH defined, most likely your
+          \nruby version is defined on your System PATH environment variable. Muto can
+          \nonly modify User environment variables, not system environment variables.
+          \nSwitch your path to ruby over to a User environment variable and you
+          \nshould be good to go :)"
+    puts "\nSystem did not update! Still using:"
   end
 end
 

data/lib/muto/version.rb

@@ -1,3 +1,4 @@
 module Muto
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: muto
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-24 00:00:00.000000000Z
+date: 2011-11-13 00:00:00.000000000Z
 dependencies: []
 description: Set up different Windows Ruby environments and switch between them on
   the command line
@@ -74,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: I got sick of manually having to change windows environment variables and