bowie 0.3.11 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75ab56cdb9510cd448eafbd96c1fdde3a73ae160
-  data.tar.gz: 3cebaac0a1f7b284ef92532956e39eae8111b51b
+  metadata.gz: 0fa7d85ce9a40d75e9f8e7614258f77e31fa2dc5
+  data.tar.gz: a6b502b078f8a2ef145795e9e3acc814a9f6b547
 SHA512:
-  metadata.gz: 5f804cf36522ffaaec3c0db1ebcda964243c8d736e50e245074569e5756ddccdfaf3bdd9252e10be8e657a34a7040e35990861614fafd0b7ea55a0d4299573ab
-  data.tar.gz: 7b3af97e43d4d424691df13555c72298365e970f60b9b9f30f2b57ff6fcb61e135b3c2c203879b2c24e4a353226b0966232edf922e4c89b5889f77bfe7d29d26
+  metadata.gz: d2fe012d8083513a4a9eb865f40471b5277ad249fabb22c676edbd58c9709fa3d44dc828ab759cda80fe38c9333cfbe0ad1b1474725b075738a7a7f38883d34b
+  data.tar.gz: e207f998bd9cecc8890ea6b130e2f35d5f18de57560d8c11d40ab6b7b8e167ed1445af96f755613ced5f71eb373d952b9d9098ff8aed310f96a72a351bb98e78

data/lib/bowie/actions/get.rb

@@ -6,7 +6,7 @@ module Bowie
         raise "song not installed"
       end
       begin
-        @lyrics = YAML.load_file("bowie_songs/#{song}/bowie.yml")
+        @lyrics = YAML.load_file("#{SongUtils.get_bowie_dir}/#{song}/bowie.yml")
       rescue
         raise "bowie.yml not found"
       end

data/lib/bowie/actions/install.rb

@@ -13,7 +13,7 @@ module Bowie
             version = false
           end
           url = @songs[name]['url']
-          path = "bowie_songs/#{name}"
+          path = "#{SongUtils.get_bowie_dir}/#{name}"
 
           if File.directory? path
             self.update(name)

data/lib/bowie/actions/prune.rb

@@ -6,7 +6,7 @@ module Bowie
       
       SongUtils.get_songs_dirs.each do |dir|
         unless @local_songs.include? dir
-          FileUtils.rm_rf("bowie_songs/#{dir}")
+          FileUtils.rm_rf("#{SongUtils.get_bowie_dir}/#{dir}")
         end
       end
     end

data/lib/bowie/actions/uninstall.rb

@@ -12,7 +12,7 @@ module Bowie
         rescue 
           version = false
         end
-        path = "bowie_songs/#{name}"
+        path = "#{SongUtils.get_bowie_dir}/#{name}"
 
         FileUtils.rm_rf(path) # use remove_entry_secure for security reasons?
 

data/lib/bowie/actions/update.rb

@@ -13,7 +13,7 @@ module Bowie
           rescue 
             version = false
           end
-          path = "bowie_songs/#{name}"
+          path = "#{SongUtils.get_bowie_dir}/#{name}"
 
           g = Git.open(path, :log => Logger.new(STDOUT))
           g.reset_hard('HEAD')

data/lib/bowie/song_utils.rb

@@ -1,5 +1,15 @@
 module Bowie
   module SongUtils
+
+    def self.get_bowie_dir
+      if File.exist? '.bowierc'
+        f = YAML.load_file '.bowierc'
+        (f['bowie-dir'] == nil) ? (return 'bowie_songs') : (return f['bowie-dir'])
+      else 
+        return 'bowie_songs'
+      end
+    end
+
     # Retrive the online registry of available songs
     def self.get_songs
       begin
@@ -27,11 +37,11 @@ module Bowie
 
     # Retrive the local lyrics file
     def self.get_local_lyrics
-      if File.exist? 'bowie_songs/lyrics.yml'
-        if self.valid_lyrics_file? 'bowie_songs/lyrics.yml'
-          return YAML.load_file('bowie_songs/lyrics.yml')
+      if File.exist? "#{self.get_bowie_dir}/lyrics.yml"
+        if self.valid_lyrics_file? "#{self.get_bowie_dir}/lyrics.yml"
+          return YAML.load_file("#{self.get_bowie_dir}/lyrics.yml")
         else
-          raise "bowie_songs/lyrics.yml is not valid"
+          raise "#{self.get_bowie_dir}/lyrics.yml is not valid"
         end
       else
         self.check_songs_dir
@@ -43,7 +53,7 @@ module Bowie
     # Return an array with all the direcotry inside bowye_songs
     def self.get_songs_dirs
       result = []
-      Dir.foreach('bowie_songs') do |el|
+      Dir.foreach(self.get_bowie_dir) do |el|
         unless (el == "." or el == ".." or el == "lyrics.yml")
           result.push el
         end
@@ -107,13 +117,13 @@ module Bowie
     end
 
     def self.check_songs_dir
-      unless File.directory? 'bowie_songs'
-        FileUtils.mkdir 'bowie_songs'
+      unless File.directory? self.get_bowie_dir
+        FileUtils.mkdir self.get_bowie_dir
       end
     end
 
     def self.create_empty_lyrics_file
-      File.open("./bowie_songs/lyrics.yml", "w"){|f| YAML.dump(Hash.new, f)}
+      File.open("./#{self.get_bowie_dir}/lyrics.yml", "w"){|f| YAML.dump(Hash.new, f)}
     end
 
   end

data/lib/bowie/version.rb

@@ -1,3 +1,3 @@
 module Bowie
-  VERSION = "0.3.11"
+  VERSION = "0.4.1"
 end

data/spec/bowie/actions/get_spec.rb

@@ -9,6 +9,7 @@ describe "Bowie::Actions" do
     
     it ".get" do
       expect {Bowie::Actions.get('bowie-test', 'foo')}.to_not raise_error
+      expect(Bowie::Actions.get('bowie-test', 'foo')).to match "bar"
     end
   end
 

data/spec/bowie/song_utils_spec.rb

@@ -114,4 +114,43 @@ describe "Bowie::SongUtils" do
     end
   end
 
+  context "when .bowierc exist and is valid" do
+    before(:each) do
+      h = Hash.new
+      h["bowie-dir"] = "foo"
+      File.open("./.bowierc", "w"){|f| YAML.dump(h, f)}
+    end
+    after(:each) do
+      FileUtils.rm_rf('./.bowierc')
+    end
+
+    it ".valid_songs_file?" do
+      expect {Bowie::SongUtils.get_bowie_dir}.to_not raise_error
+      expect(Bowie::SongUtils.get_bowie_dir).to match "foo"
+    end
+  end
+
+  context "when .bowierc exist and is not valid" do
+    before(:each) do
+      h = Hash.new
+      h["bowie"] = "foo"
+      File.open("./.bowierc", "w"){|f| YAML.dump(h, f)}
+    end
+    after(:each) do
+      FileUtils.rm_rf('./.bowierc')
+    end
+
+    it ".valid_songs_file?" do
+      expect {Bowie::SongUtils.get_bowie_dir}.to_not raise_error
+      expect(Bowie::SongUtils.get_bowie_dir).to match "bowie_songs"
+    end
+  end
+
+  context "when .bowierc do not exist" do
+    it ".valid_songs_file?" do
+      expect {Bowie::SongUtils.get_bowie_dir}.to_not raise_error
+      expect(Bowie::SongUtils.get_bowie_dir).to match "bowie_songs"
+    end
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bowie
 version: !ruby/object:Gem::Version
-  version: 0.3.11
+  version: 0.4.1
 platform: ruby
 authors:
 - Andrea Moretti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-26 00:00:00.000000000 Z
+date: 2013-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler