Moves the default config to /config

diff --git a/lib/lyricli/defaults.json b/config/defaults.json
similarity index 100%
rename from lib/lyricli/defaults.json
rename to config/defaults.json

diff --git a/lib/lyricli.rb b/lib/lyricli.rb
index 31571c8b8ce034047c0b12f42a797f6406994fa0..73c5811a0e7a102d39f34ea2057407efb050a8c7 100755 (executable)
--- a/lib/lyricli.rb
+++ b/lib/lyricli.rb
@@ -86,4 +86,11 @@ module Lyricli
       "There is no such Source"
     end
   end
       "There is no such Source"
     end
   end

+
+  # Returns the root of the Gem.
+  #
+  # @return [String] the root path for this gem
+  def self.root
+    File.expand_path('../..',__FILE__)
+  end

 end
 end

diff --git a/lib/lyricli/configuration.rb b/lib/lyricli/configuration.rb
index 720070ced8181acaa438851a009429e927dbc6a3..811526b5d06b62491106b00e6c1f46d01ec80fd3 100644 (file)
--- a/lib/lyricli/configuration.rb
+++ b/lib/lyricli/configuration.rb
@@ -77,8 +77,7 @@ module Lyricli
     # Loads the default configuration from a JSON file
     def load_default_config
       # Load the default
     # Loads the default configuration from a JSON file
     def load_default_config
       # Load the default

-      path_root = File.expand_path(File.dirname(__FILE__))
-      path = File.join(path_root, @defaults_path)
+      path = File.join(::Lyricli.root, "config", @defaults_path)

 
       if File.exists?(path)
         file = File.new(path, "r")
 
       if File.exists?(path)
         file = File.new(path, "r")

diff --git a/lib/lyricli/sources/rdio.rb b/lib/lyricli/sources/rdio.rb
index 76d0ed1fa60eef15b4150ce1fa0837c38e7670a4..0be89f390a7b04ec8b224ef7eea44bb01f9bbae3 100644 (file)
--- a/lib/lyricli/sources/rdio.rb
+++ b/lib/lyricli/sources/rdio.rb
@@ -68,7 +68,6 @@ module Lyricli
         @config["rdio_auth_token"] = token
         token
       end
         @config["rdio_auth_token"] = token
         token
       end

-

     end
   end
 end
     end
   end
 end

diff --git a/lyricli-0.0.1.gem b/lyricli-0.0.1.gem
index 3dc9459202107e6d5cf4ce1305449fd5b08a4165..278c0005a03a6cd3b3b3cd31482d40af33b6a486 100644 (file)
Binary files a/lyricli-0.0.1.gem and b/lyricli-0.0.1.gem differ

diff --git a/lyricli.gemspec b/lyricli.gemspec
index 44be23ba80c1f5d09ef7bbb6503e477eb34586c3..584f808e0809ff6b9450f2062d4d53d0c835c0ac 100644 (file)
--- a/lyricli.gemspec
+++ b/lyricli.gemspec
@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
 
   s.files = Dir['lib/**/*.rb'] + Dir['bin/*']
   s.files += Dir['[A-Z]*'] + Dir['spec/**/*']
 
   s.files = Dir['lib/**/*.rb'] + Dir['bin/*']
   s.files += Dir['[A-Z]*'] + Dir['spec/**/*']

-  s.files += Dir['lib/**/*.json', 'lib/**/*.scpt']
+  s.files += Dir['config/**/*', 'lib/**/*.scpt']

 
   s.executables << 'lrc'
 
 
   s.executables << 'lrc'
 


@@ -23,4 +23,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'ruby-debug19', '~> 0.11.6'
   s.add_development_dependency 'yard', '~> 0.8.2.1'
   s.add_development_dependency 'thin', '~> 1.5.0'
   s.add_development_dependency 'ruby-debug19', '~> 0.11.6'
   s.add_development_dependency 'yard', '~> 0.8.2.1'
   s.add_development_dependency 'thin', '~> 1.5.0'

+  s.add_development_dependency 'rspec', '~> 2.11.0'

 end
 end