bowie 0.3.8 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6de128b1a903cc5e6e15cf5b84fab85a3c376c6
-  data.tar.gz: 99666a1ee7cba1791b892d5ac8d7b3657a30edb1
+  metadata.gz: b1d11347f6f13ef0b6277970b9a3ddd1be58ee5b
+  data.tar.gz: 2ddb2a6e22adc24846c9f872844784e863835fdd
 SHA512:
-  metadata.gz: 25091b0792ffe4e226c6021e682a6b00155398098a283a99c51f688a99ba69d4936e60959f296ca287392f80f5d1f5325de6b8a16c00b3d05554f4200e92cb65
-  data.tar.gz: 1f05ddff20967d19416b9f04053ebcb9ab17835a6fda67ca43c6f345d1b98490e3f4b38023efecb36bd02e2cfc837784f3153b29d68fa44c7ebcc20a53012fde
+  metadata.gz: ec78b408d237502e9d225e647edc83cb2902cfcce9dc63d5642dc28d81ac0a507cf525b5a409856cb06d24f7b2bdbd4c65355183a5f7c01382ac8e610b1be840
+  data.tar.gz: 46f11400095274a130c39fcd4cee63aadeb4d1640a80796b8238b920892bd7afcea62b064bf2bacad47abdfe13ec6f413af4b2e7b865430486ef4ce3ce20aee6

data/lib/bowie/song_utils.rb

@@ -5,34 +5,37 @@ module Bowie
       begin
         YAML.parse(open("https://raw.github.com/axyz/bowie-songs/master/songs.yml")).to_ruby
       rescue
-        puts "ERROR: Cannot connect to github.com"
+        raise "cannot connect to github.com"
       end
     end
 
     # Retrive the local registry of installed songs
     def self.get_local_songs
-      begin
-        YAML.load_file('songs.yml')? YAML.load_file('songs.yml') : Array.new
-      rescue
-        begin
-          FileUtils.mkdir 'bowie_songs'
-        rescue 
+      if File.exist? 'songs.yml'
+        if self.valid_songs_file? 'songs.yml'
+          self.check_songs_dir
+          return YAML.load_file('songs.yml')
+        else
+          raise "songs.yml is not valid"
         end
-        FileUtils.touch 'songs.yml'
+      else
+        self.create_empty_songs_file
+        self.check_songs_dir
         return Array.new
       end
     end
 
     # Retrive the local lyrics file
     def self.get_local_lyrics
-      begin
-        YAML.load_file('bowie_songs/lyrics.yml')? YAML.load_file('songs.yml') : Hash.new
-      rescue
-        begin
-          FileUtils.mkdir 'bowie_songs'
-        rescue
+      if File.exist? 'bowie_songs/lyrics.yml'
+        if self.valid_lyrics_file? 'bowie_songs/lyrics.yml'
+          return YAML.load_file('bowie_songs/lyrics.yml')
+        else
+          raise "bowie_songs/lyrics.yml is not valid"
         end
-        FileUtils.touch 'bowie_songs/lyrics.yml'
+      else
+        self.check_songs_dir
+        self.create_empty_lyrics_file
         return Hash.new
       end
     end
@@ -57,5 +60,46 @@ module Bowie
     def self.parse_song_version(s)
       s.split("#")[1]
     end
+
+    def self.valid_songs_file?(file)
+      begin
+        f = YAML.load_file file
+        f.each do |s|
+          unless valid_song? s
+            return false
+          end
+        end
+        return true
+      rescue
+        return false
+      end
+    end
+
+    def self.valid_song?(string)
+      (string =~ /^[a-z0-9]+(-?[a-z0-9])*(#\d+.\d+.\d+)?$/) == nil ? false : true
+    end
+
+    def self.valid_lyrics_file?(file)
+      begin
+        f = YAML.load_file file
+        (f.is_a? Hash)? true : false
+      rescue
+        false
+      end
+    end
+
+    def self.create_empty_songs_file
+      File.open("./songs.yml", "w"){|f| YAML.dump(Array.new, f)}
+    end
+
+    def self.check_songs_dir
+      unless File.directory? 'bowie_songs'
+        FileUtils.mkdir 'bowie_songs'
+      end
+    end
+
+    def self.create_empty_lyrics_file
+      File.open("./bowie_songs/lyrics.yml", "w"){|f| YAML.dump(Hash.new, f)}
+    end
   end
 end

data/lib/bowie/version.rb

@@ -1,3 +1,3 @@
 module Bowie
-  VERSION = "0.3.8"
+  VERSION = "0.3.9"
 end

data/spec/bowie/actions/install_spec.rb

@@ -0,0 +1,58 @@
+describe "Bowie::Actions" do
+  it ".install [song]" do
+    expect {Bowie::Actions.install('bowie-test')}.to_not raise_error
+    expect(File.directory? './bowie_songs').to be true
+    expect(File.directory? './bowie_songs/bowie-test').to be true
+    expect(File.exist? './songs.yml').to be true
+    expect(Bowie::SongUtils.get_local_songs.include? 'bowie-test').to be true
+    expect(Bowie::SongUtils.get_local_songs.length).to be 1
+  end
+
+  context "when songs.yml exist" do
+    before(:each) do
+      File.open("./songs.yml", "w"){|f| YAML.dump(["bowie-test"], f)}
+    end
+    after(:each) do
+      FileUtils.rm_rf('./songs.yml')
+    end
+
+    it "install with no argument" do
+      expect {Bowie::Actions.install()}.to_not raise_error
+      expect(File.directory? './bowie_songs').to be true
+      expect(File.directory? './bowie_songs/bowie-test').to be true
+      expect(File.exist? './songs.yml').to be true
+      expect(Bowie::SongUtils.get_local_songs.include? 'bowie-test').to be true
+      expect(Bowie::SongUtils.get_local_songs.length).to be 1
+    end
+  end
+
+  context "when songs.yml do not exist" do
+    it "install with no argument" do
+      expect {Bowie::Actions.install()}.to_not raise_error
+      expect(File.directory? './bowie_songs').to be true
+      expect(File.directory? './bowie_songs/bowie-test').to be false
+      expect(File.exist? './songs.yml').to be true
+      expect(Bowie::SongUtils.get_local_songs.include? 'bowie-test').to be false
+      expect(Bowie::SongUtils.get_local_songs.length).to be 0
+    end
+  end
+
+  context "when songs.yml is not valid" do
+    before(:each) do
+      h = Hash.new
+      h['bowie-test'] = '0.0.1'
+      File.open("./songs.yml", "w"){|f| YAML.dump(h, f)}
+    end
+    after(:each) do
+      FileUtils.rm_rf('./songs.yml')
+    end
+
+    it "install with no argument" do
+      expect {Bowie::Actions.install()}.to raise_error "songs.yml is not valid"
+      expect(File.directory? './bowie_songs').to be false
+      expect(File.directory? './bowie_songs/bowie-test').to be false
+      expect(File.exist? './songs.yml').to be true
+      expect(Bowie::SongUtils.valid_songs_file? './songs.yml').to be false
+    end
+  end
+end

data/spec/bowie/song_utils_spec.rb

@@ -0,0 +1,81 @@
+describe "Bowie::SongUtils" do
+  it ".parse_song_name" do
+    expect {Bowie::SongUtils.parse_song_name 'bowie-test#0.0.1'}.to_not raise_error
+    expect(Bowie::SongUtils.parse_song_name 'bowie-test#0.0.1').to match "bowie-test"
+  end
+
+  it ".parse_song_version" do
+    expect {Bowie::SongUtils.parse_song_version 'bowie-test#0.0.1'}.to_not raise_error
+    expect(Bowie::SongUtils.parse_song_version 'bowie-test#0.0.1').to match "0.0.1"
+  end
+
+  it ".valid_song?" do
+    expect(Bowie::SongUtils.valid_song? 'bowie-test').to be true
+    expect(Bowie::SongUtils.valid_song? 'bowie-test#0.0.1').to be true
+    expect(Bowie::SongUtils.valid_song? '-foo-bar').to be false
+    expect(Bowie::SongUtils.valid_song? 'foo-bar-').to be false
+    expect(Bowie::SongUtils.valid_song? 'foo-bar-#0.0.1').to be false
+    expect(Bowie::SongUtils.valid_song? 'foo-bar#0.1').to be false
+    expect(Bowie::SongUtils.valid_song? 'foo-bar#0.1.2.3').to be false
+  end
+
+  context "when lyrics.yml is valid" do
+    before(:each) do
+      File.open("./lyrics.yml", "w"){|f| YAML.dump(Hash.new, f)}
+    end
+    after(:each) do
+      FileUtils.rm_rf('./lyrics.yml')
+    end
+    
+    it ".valid_lyrics_file?" do
+      expect {Bowie::SongUtils.valid_lyrics_file? './lyrics.yml'}.to_not raise_error
+      expect(Bowie::SongUtils.valid_lyrics_file? './lyrics.yml').to be true
+    end
+  end
+
+  context "when lyrics.yml is not valid" do
+    before(:each) do
+      File.open("./lyrics.yml", "w"){|f| YAML.dump(Array.new, f)}
+    end
+    after(:each) do
+      FileUtils.rm_rf('./lyrics.yml')
+    end
+    
+    it ".valid_lyrics_file?" do
+      expect {Bowie::SongUtils.valid_lyrics_file? './lyrics.yml'}.to_not raise_error
+      expect(Bowie::SongUtils.valid_lyrics_file? './lyrics.yml').to be false
+    end
+  end
+
+  context "when songs.yml is valid" do
+    before(:each) do
+      File.open("./songs.yml", "w"){|f| YAML.dump(["bowie-test", "foo", "bar"], f)}
+    end
+    after(:each) do
+      FileUtils.rm_rf('./songs.yml')
+    end
+
+    it ".valid_songs_file?" do
+      expect {Bowie::SongUtils.valid_songs_file? './songs.yml'}.to_not raise_error
+      expect(Bowie::SongUtils.valid_songs_file? './songs.yml').to be true
+    end
+  end
+
+  context "when songs.yml is not valid" do
+    before(:each) do
+      h = Hash.new
+      h["bowie-test"] = ".0.1"
+      h["susy"] = "0.0.1"
+      File.open("./songs.yml", "w"){|f| YAML.dump(h, f)}
+    end
+    after(:each) do
+      FileUtils.rm_rf('./songs.yml')
+    end
+
+    it ".valid_songs_file?" do
+      expect {Bowie::SongUtils.valid_songs_file? './songs.yml'}.to_not raise_error
+      expect(Bowie::SongUtils.valid_songs_file? './songs.yml').to be false
+    end
+  end
+
+end

data/spec/bowie_spec.rb

@@ -3,9 +3,8 @@ require './lib/bowie'
 require './spec/spec_helper.rb'
 
 describe "Bowie" do
-  it "executes actions" do
-    Dir.glob('./spec/actions/*') do |spec|
-      require spec
-    end
+  require './spec/bowie/song_utils_spec'
+  Dir.glob('./spec/bowie/actions/*') do |spec|
+    require spec
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bowie
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.9
 platform: ruby
 authors:
 - Andrea Moretti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-17 00:00:00.000000000 Z
+date: 2013-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,12 +108,13 @@ files:
 - lib/bowie/utils.rb
 - lib/bowie/version.rb
 - lib/semver/semver.rb
-- spec/actions/install_spec.rb
-- spec/actions/list_spec.rb
-- spec/actions/prune_spec.rb
-- spec/actions/search_spec.rb
-- spec/actions/uninstall_spec.rb
-- spec/actions/update_spec.rb
+- spec/bowie/actions/install_spec.rb
+- spec/bowie/actions/list_spec.rb
+- spec/bowie/actions/prune_spec.rb
+- spec/bowie/actions/search_spec.rb
+- spec/bowie/actions/uninstall_spec.rb
+- spec/bowie/actions/update_spec.rb
+- spec/bowie/song_utils_spec.rb
 - spec/bowie_spec.rb
 - spec/spec_helper.rb
 homepage: http://axyz.github.io/bowie/
@@ -141,11 +142,12 @@ signing_key:
 specification_version: 4
 summary: The White Duke rules them all
 test_files:
-- spec/actions/install_spec.rb
-- spec/actions/list_spec.rb
-- spec/actions/prune_spec.rb
-- spec/actions/search_spec.rb
-- spec/actions/uninstall_spec.rb
-- spec/actions/update_spec.rb
+- spec/bowie/actions/install_spec.rb
+- spec/bowie/actions/list_spec.rb
+- spec/bowie/actions/prune_spec.rb
+- spec/bowie/actions/search_spec.rb
+- spec/bowie/actions/uninstall_spec.rb
+- spec/bowie/actions/update_spec.rb
+- spec/bowie/song_utils_spec.rb
 - spec/bowie_spec.rb
 - spec/spec_helper.rb

data/spec/actions/install_spec.rb

@@ -1,10 +0,0 @@
-describe "Bowie::Actions" do
-  it ".install [song]" do
-    expect {Bowie::Actions.install('bowie-test')}.to_not raise_error
-    expect(File.directory? './bowie_songs').to be true
-    expect(File.directory? './bowie_songs/bowie-test').to be true
-    expect(File.exist? './songs.yml').to be true
-    expect(Bowie::SongUtils.get_local_songs.include? 'bowie-test').to be true
-    expect(Bowie::SongUtils.get_local_songs.length).to be 1
-  end
-end