fixing my git messups

jwoertink · Aug 5, 2012 · c4db1e5 · c4db1e5
1 parent b6c377d
commit c4db1e5
Show file tree

Hide file tree

Showing 18 changed files with 25 additions and 5 deletions.
diff --git a/Gemfile b/Gemfile
@@ -2,4 +2,4 @@ source :rubygems
 
 gem 'gosu', '0.7.45'
 
-#gem 'ocra'
+gem 'releasy'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,14 +1,34 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    cri (2.1.0)
+    faster_xml_simple (0.5.0)
+      libxml-ruby (>= 0.3.8.4)
     gosu (0.7.45)
     gosu (0.7.45-x86-mingw32)
+    httpclient (2.2.5)
+    json (1.7.4)
+    libxml-ruby (2.3.3)
+    net-github-upload (0.0.8)
+      faster_xml_simple
+      httpclient
+      json
+      nokogiri (>= 1.4.0)
+    nokogiri (1.5.5)
     ocra (1.3.0)
+    rake (0.9.2.2)
+    releasy (0.2.2)
+      cri (~> 2.1.0)
+      net-github-upload (~> 0.0.8)
+      ocra (~> 1.3.0)
+      rake (~> 0.9.2.2)
+      thor (~> 0.14.6)
+    thor (0.14.6)
 
 PLATFORMS
   ruby
   x86-mingw32
 
 DEPENDENCIES
   gosu (= 0.7.45)
-  ocra
+  releasy
diff --git a/LICENSE.txt b/LICENSE.txt
diff --git a/Rakefile b/Rakefile
diff --git a/end_game_screen.rb → lib/end_game_screen.rb b/end_game_screen.rb → lib/end_game_screen.rb
diff --git a/info_screen.rb → lib/info_screen.rb b/info_screen.rb → lib/info_screen.rb
diff --git a/map.rb → lib/map.rb b/map.rb → lib/map.rb
diff --git a/monster.rb → lib/monster.rb b/monster.rb → lib/monster.rb
diff --git a/monster_select_screen.rb → lib/monster_select_screen.rb b/monster_select_screen.rb → lib/monster_select_screen.rb
diff --git a/option_selector.rb → lib/option_selector.rb b/option_selector.rb → lib/option_selector.rb
diff --git a/phone.rb → lib/phone.rb b/phone.rb → lib/phone.rb
diff --git a/play.rb → lib/play.rb b/play.rb → lib/play.rb
@@ -1,6 +1,6 @@
 require 'rubygems'
 require 'gosu'
-require File.join(File.dirname(__FILE__), 'utilities')
+require_relative 'utilities'
 include Utilities
 
 require lib_path('timer')

diff --git a/score_screen.rb → lib/score_screen.rb b/score_screen.rb → lib/score_screen.rb
diff --git a/tiles.rb → lib/tiles.rb b/tiles.rb → lib/tiles.rb
diff --git a/timer.rb → lib/timer.rb b/timer.rb → lib/timer.rb
diff --git a/title_screen.rb → lib/title_screen.rb b/title_screen.rb → lib/title_screen.rb
diff --git a/utilities.rb → lib/utilities.rb b/utilities.rb → lib/utilities.rb
@@ -1,6 +1,6 @@
 module Utilities
 
-  ROOT_PATH = File.dirname(__FILE__)
+  ROOT_PATH = File.join(File.dirname(__FILE__), '..')
 
   def asset_path(filename)
     folder = case filename.split('.').last
@@ -15,7 +15,7 @@ def asset_path(filename)
   end
 
   def lib_path(filename)
-    File.join(ROOT_PATH, filename)
+    File.join(ROOT_PATH, 'lib', filename)
   end
 
 end
diff --git a/window.rb → lib/window.rb b/window.rb → lib/window.rb