bowie 0.3.9 → 0.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1d11347f6f13ef0b6277970b9a3ddd1be58ee5b
-  data.tar.gz: 2ddb2a6e22adc24846c9f872844784e863835fdd
+  metadata.gz: 42aab442a0a17cea8dd78c49d288f59dd5906aff
+  data.tar.gz: e6ef02f2594e95dfd81b2e92f7f2e2ed1c7becf4
 SHA512:
-  metadata.gz: ec78b408d237502e9d225e647edc83cb2902cfcce9dc63d5642dc28d81ac0a507cf525b5a409856cb06d24f7b2bdbd4c65355183a5f7c01382ac8e610b1be840
-  data.tar.gz: 46f11400095274a130c39fcd4cee63aadeb4d1640a80796b8238b920892bd7afcea62b064bf2bacad47abdfe13ec6f413af4b2e7b865430486ef4ce3ce20aee6
+  metadata.gz: 0f487c1da790206168320b44d040d15ebda1a43f568355fdb1f816f05989077ede2ce394662cebbdb4166a591c8a34f9f6af2f1f6b7c630c3a0d2c0ca5cb1197
+  data.tar.gz: ee60ffb690f85fd246027754ce8cb1dfb01078533c7ff93a7e4a75927983a310968297881d7338ec66cf632c523698a53e22d238dde7f86e8fcf51addb337e46

data/lib/bowie/actions/install.rb

@@ -7,7 +7,11 @@ module Bowie
       if songs.length > 0
         songs.each do |song|
           name = SongUtils.parse_song_name song
-          version = Semver.new(SongUtils.parse_song_version song)
+          begin
+            version = Semver.new(SongUtils.parse_song_version song)
+          rescue 
+            version = false
+          end
           url = @songs[name]['url']
           path = "bowie_songs/#{name}"
 
@@ -16,7 +20,7 @@ module Bowie
           else
             FileUtils.mkdir_p(path)
             Git.clone(url, path)
-            if version.major != nil
+            if version
               g = Git.open(path)
               begin
                 g.checkout(version.to_s)
@@ -30,7 +34,7 @@ module Bowie
           end
 
           unless @local_songs.include? name or @local_songs.include? name+'#'+version.to_s
-            version.major ? @local_songs.push(name+'#'+version.to_s) : @local_songs.push(name)
+            version ? @local_songs.push(name+'#'+version.to_s) : @local_songs.push(name)
           end
           File.open("songs.yml", "w"){|f| YAML.dump(@local_songs, f)}
         end

data/lib/bowie/actions/uninstall.rb

@@ -7,12 +7,16 @@ module Bowie
 
       songs.each do |song|
         name = SongUtils.parse_song_name song
-        version = Semver.new(SongUtils.parse_song_version song)
+        begin
+          version = Semver.new(SongUtils.parse_song_version song)
+        rescue 
+          version = false
+        end
         path = "bowie_songs/#{name}"
 
         FileUtils.rm_rf(path) # use remove_entry_secure for security reasons?
 
-        if version.major != nil
+        if version
           @local_songs.delete "#{name}##{version}"
         else
           @local_songs.delete_if {|el| not (el =~ /^#{name}#/).nil?}

data/lib/bowie/actions/update.rb

@@ -8,13 +8,17 @@ module Bowie
       if songs.length > 0
         songs.each do |song|
           name = SongUtils.parse_song_name song
-          version = Semver.new(SongUtils.parse_song_version song)
+          begin
+            version = Semver.new(SongUtils.parse_song_version song)
+          rescue 
+            version = false
+          end
           path = "bowie_songs/#{name}"
 
           g = Git.open(path, :log => Logger.new(STDOUT))
           g.reset_hard('HEAD')
           g.pull
-          unless version.major.nil?
+          unless version
             begin
               g.checkout(version.to_s)
             rescue
@@ -26,7 +30,7 @@ module Bowie
           end
           @local_songs.delete name
           @local_songs.delete_if {|el| not (el =~ /^#{name}#/).nil?}
-          version.major ? @local_songs.push(name+'#'+version.to_s) : @local_songs.push(name)
+          version ? @local_songs.push(name+'#'+version.to_s) : @local_songs.push(name)
           File.open("songs.yml", "w"){|f| YAML.dump(@local_songs, f)}
         end
       else

data/lib/bowie/song_utils.rb

@@ -76,7 +76,7 @@ module Bowie
     end
 
     def self.valid_song?(string)
-      (string =~ /^[a-z0-9]+(-?[a-z0-9])*(#\d+.\d+.\d+)?$/) == nil ? false : true
+      (string =~ /\A[a-z0-9]+(-?[a-z0-9])*(#\d+.\d+.\d+)?\z/) == nil ? false : true
     end
 
     def self.valid_lyrics_file?(file)

data/lib/bowie/version.rb

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

data/lib/semver/semver.rb

@@ -16,10 +16,10 @@ class Semver
         @minor = Integer v[1]
         @patch = Integer v[2]
       else
-        false
+        raise "invalid semver"
       end
     else
-      false
+      raise ArgumentError
     end
   end
 
@@ -87,6 +87,6 @@ private
 
     # return true if [string] is a valid semantic version in the form x.x.x or vx.x.x
     def valid?(string)
-      (/^v?\d+.\d+.\d+$/ =~ string)? true : false
+      (/\Av?\d+.\d+.\d+\z/ =~ string)? true : false
     end
 end

data/spec/semver/semver_spec.rb

@@ -0,0 +1,44 @@
+require 'rspec'
+require './lib/semver/semver'
+
+describe Semver do
+
+  context "when valid #semver in x.x.x form" do
+    it "initialize without errors" do
+      expect {Semver.new "1.2.3"}.to_not raise_error
+    end
+
+    subject(:version) {Semver.new "1.2.3"}
+    it "initialize correctly major, minor and patch parameters" do
+      expect(version.major).to be 1
+      expect(version.minor).to be 2
+      expect(version.patch).to be 3
+    end
+  end
+
+  context "when valid #semver in vx.x.x form" do
+    it "initialize without errors" do
+      expect {Semver.new "v1.2.3"}.to_not raise_error
+    end
+
+    subject(:version) {Semver.new "v1.2.3"}
+    it "initialize correctly major, minor and patch parameters" do
+      expect(version.major).to be 1
+      expect(version.minor).to be 2
+      expect(version.patch).to be 3
+    end
+  end
+
+  context "when initialized with invalid semver string" do
+    it "raise invalid semver error" do
+      expect {Semver.new "v1.2.3.4"}.to raise_error "invalid semver"
+    end
+  end
+
+  context "when initialized with too mani arguments" do
+    it "raise ArgumentError" do
+      expect {Semver.new "v1.2.3", "foo"}.to raise_error ArgumentError
+    end
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bowie
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.3.10
 platform: ruby
 authors:
 - Andrea Moretti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-18 00:00:00.000000000 Z
+date: 2013-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -116,6 +116,7 @@ files:
 - spec/bowie/actions/update_spec.rb
 - spec/bowie/song_utils_spec.rb
 - spec/bowie_spec.rb
+- spec/semver/semver_spec.rb
 - spec/spec_helper.rb
 homepage: http://axyz.github.io/bowie/
 licenses:
@@ -150,4 +151,5 @@ test_files:
 - spec/bowie/actions/update_spec.rb
 - spec/bowie/song_utils_spec.rb
 - spec/bowie_spec.rb
+- spec/semver/semver_spec.rb
 - spec/spec_helper.rb