fdietz-ruby-config 0.3.0 → 0.4.0

data/lib/ruby_config/profile_config.rb

@@ -1,61 +1,77 @@
-# Not used currently
 module RubyConfig
+
   class ProfileConfig 
         
     def initialize(bash_profile_path)
       @bash_profile_path = bash_profile_path
     end
     
-    def change
-      RubyConfig::FileHelper.append_content_to_file(content_with_header, @bash_profile_path)
+    def apply_changes
+      File.open(@bash_profile_path, 'a') { |file| file.write content_for_existing_script }
     end
     
     def exists?
-      RubyConfig::FileHelper.read_content_from_file(@bash_profile_path).include?(content)
+      File.open(@bash_profile_path, "r")  { |file| file.read  }.include?(export_variables_string)
     end
 
-    def content_with_header
-      str = header
-      str << content
-      str
+    def file_exists?
+      File.exists?(@bash_profile_path)
+    end
+    
+    def create_new_file
+      File.open(@bash_profile_path, 'w') { |file| file.write content_for_new_script }
     end
     
-    def content
+    def export_variables_string
       str = ""
       [ruby_home, gem_home, gem_path, path].each do |line|
         str << export_line(line)
       end
       str
     end
-    
+
     private 
     
+    def content_for_new_script
+      str = bash_header
+      str << "\n"
+      str << header
+      str << export_variables_string
+    end
+    
+    def content_for_existing_script
+      str = "\n"
+      str = header
+      str << export_variables_string
+      str
+    end
+        
+    def bash_header
+      "#!/bin/bash"
+    end
+    
     def header
       "# ruby-config v#{RubyConfig.version}"
     end
     
     def ruby_home
-      "RUBY_HOME=#{home}/#{ruby_config}/ruby"
+      "RUBY_HOME=#{ruby_config_path}/ruby"
     end
     
     def gem_home
-      "GEM_HOME=#{home}/#{ruby_config}/gem"
+      "GEM_HOME=#{ruby_config_path}/gem"
     end
     
     def gem_path
-      "GEM_PATH=#{home}/#{ruby_config}/gem"
+      "GEM_PATH=#{ruby_config_path}/gem"
     end
     
     def path
       "PATH=$RUBY_HOME/bin:$GEM_HOME/bin:$PATH"
     end
-    
-    def home
-      "$HOME"
-    end
-    
-    def ruby_config
-      ".ruby-config"
+
+    def ruby_config_path
+      "$HOME/.ruby-config"
     end
     
     def export_line(str)

data/lib/ruby_config/runner.rb

@@ -46,23 +46,29 @@ module RubyConfig
     
     def setup
       config = RubyConfig::ProfileConfig.new(bash_profile_path)
-      
-      if config.exists?
+      if config.file_exists? && config.exists?
         puts "Found existing profile configuration. You are all set!"
       else
-        puts "Ruby-Config will add the following lines to your environment:"
-        puts "#{bash_profile_path}:"
-        puts config.content
-        puts
-        
-        if agree("Append configuration to your profile? [y/n]  ", true)
-          config.change
-          puts 
-          puts "Done! To apply changes execute the following command:"
-          puts " source #{bash_profile_path}"
+        show_configuration_changes(config.export_variables_string)
+        if agree("Apply configuration changes? [y/n]  ", true)
+          config.file_exists? ? config.apply_changes : config.create_new_file
+          educate_about_source_profile
         end
       end
     end
+
+    def educate_about_source_profile
+      puts
+      puts "Done! Either start a new shell or execute the following command to apply the changes to your current shell:"
+      puts "# source #{bash_profile_path}"
+    end
+    
+    def show_configuration_changes(content)
+      puts "Ruby-Config will apply the following changes to your profile"
+      puts "#{bash_profile_path}:"
+      puts content
+      puts
+    end
     
     def bash_profile_path
       File.join(ENV['HOME'], '.bash_profile')

data/test/unit/profile_config_test.rb

@@ -0,0 +1,79 @@
+require File.join(File.dirname(__FILE__), '..', 'test_helper')
+#require 'ruby_config/profile_config'
+
+class ProfileConfigTest < Test::Unit::TestCase
+  
+  def setup
+    @file = File.join('/', 'tmp', 'bash_profile') 
+    @config = RubyConfig::ProfileConfig.new(@file)
+  end
+  
+  def teardown
+    FileUtils.rm(@file) if File.exist?(@file)
+  end
+  
+  test "should return true if file exists" do
+    File.open(@file, 'w') { |file| file.write "blabla" }
+    assert @config.file_exists?
+  end
+  
+  test "should return false if file does NOT exist" do
+    assert_equal false, @config.file_exists?
+  end
+
+  test "should return false if configuration does NOT exist" do
+    File.open(@file, 'w') { |file| file.write "blabla" }
+    assert_equal false, @config.exists?
+  end
+  
+  test "should return true if configuration exists" do
+    @config.create_new_file
+    assert @config.exists?
+  end
+  
+  test "should create new bash_profile file" do
+    @config.create_new_file
+    
+    content = File.open(@file, "r")  { |file| file.read  }
+    assert content.include?("ruby-config")
+  end
+  
+  test "should apply changes to existing bash_profile file" do
+    File.open(@file, 'w') { |file| file.write "#!bin/bash\n" }
+    @config.apply_changes
+    
+    content = File.open(@file, "r")  { |file| file.read  }
+    assert content.include?("ruby-config")
+  end
+  
+  test "should contain the RUBY_HOME variable" do
+    result = @config.send(:export_variables_string)
+    assert result.include?("RUBY_HOME=$HOME/.ruby-config/ruby")
+  end
+  
+  test "should contain the GEM_HOME variable" do
+    result = @config.send(:export_variables_string)
+    assert result.include?("GEM_HOME=$HOME/.ruby-config/gem")
+  end
+  
+  test "should contain the GEM_PATH variable" do
+    result = @config.send(:export_variables_string)
+    assert result.include?("GEM_PATH=$HOME/.ruby-config/gem")
+  end
+  
+  test "should contain the PATH variable" do
+    result = @config.send(:export_variables_string)
+    assert result.include?("PATH=$RUBY_HOME/bin:$GEM_HOME/bin:$PATH")
+  end
+  
+  test "should contain the ruby-config header" do
+    result = @config.send(:content_for_existing_script)
+    assert result.include?("# ruby-config v#{RubyConfig.version}")
+  end
+  
+  test "should contain bash script header" do
+    result = @config.send(:content_for_new_script)
+    assert result.include?("#!/bin/bash")
+  end
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fdietz-ruby-config
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Frederik Dietz
@@ -41,6 +41,7 @@ files:
 - README.md
 has_rdoc: false
 homepage: http://github.com/fdietz/ruby-config
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -61,10 +62,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Install and Switch between various Ruby Runtimes easily
 test_files: 
+- test/unit/profile_config_test.rb
 - test/unit/registry_test.rb
 - test/unit/runtime_base_test.rb