Skip to content

Commit

Permalink
Merge branch 'master' into ironruby_support
Browse files Browse the repository at this point in the history
  • Loading branch information
vertiginous committed Sep 28, 2009
2 parents 916943f + 5e014c2 commit 534af9b
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 2 deletions.
5 changes: 5 additions & 0 deletions History.txt
@@ -1,3 +1,8 @@
=== 0.1.1 / 2009-09-25

* add rubyforge info to README
* Fixes bug in add command that wouldn't allow you to add - GH-13

=== 0.1.0 / 2009-09-24

* removed jruby support for the time being (lack of win32ole is a problem)
Expand Down
1 change: 1 addition & 0 deletions README.rdoc
@@ -1,6 +1,7 @@
= pik

http://github.com/vertiginous/pik
http://rubyforge.org/projects/pik/

Gordon Thiesfeld

Expand Down
2 changes: 1 addition & 1 deletion lib/pik.rb
@@ -1,5 +1,5 @@
module Pik
VERSION = '0.1.0'
VERSION = '0.1.1'
end


Expand Down
1 change: 1 addition & 0 deletions lib/pik/commands/add_command.rb
Expand Up @@ -23,6 +23,7 @@ def add(path)
version = get_version(path)
path = path.expand_path.to_ruby
puts "Adding: #{version}'\n Located at: #{path}\n"
@config[version] = {}
@config[version][:path] = path
end
else
Expand Down
2 changes: 1 addition & 1 deletion lib/pik/config_file.rb
Expand Up @@ -6,7 +6,7 @@ class ConfigFile < Hash

def initialize
@file = File.join(PIK_HOME, 'config.yml')
super{|h,k| h[k] = Hash.new }
super
if File.exists? @file
self.update( YAML.load( File.read( @file ) ) )
end
Expand Down

0 comments on commit 534af9b

Please sign in to comment.