bowie 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c182a6f7349ab0663779585067e40a2aab576b3
-  data.tar.gz: e56ac3de3987bf09947200d3e6b8cc81466639c6
+  metadata.gz: 2a1627386c87e3785efd62c3c32e9a2e05a89863
+  data.tar.gz: 961ca9b6ee29c6a7db3ce15a50741119b83985b2
 SHA512:
-  metadata.gz: f7f3cf3b0cc084f746f9701290d20cb618542edb7e940c995457aaf51497f334435ce264907a31c4e62bef93c9f4fef6a1bf8fd3be2634c64eafc750fd584896
-  data.tar.gz: 9d0dfaddf0102d2385b7f9354bf8f07d265fca280945934341eb73c2a159f62c100edefec835e55108b60fe9697f5c299acc24c1d818250ccb53d5c7bfbbaa63
+  metadata.gz: 2b17b0c8664ad75cf4b12ca14b3a5799096e4f35382530075ea8be0d2fa50f4e0d388e844ae0800466171a071a3330cc1e400aa8433435b1fc2a7eeb0eb07eda
+  data.tar.gz: 15b9cac6ae41dca43c96b1c60c882c3cb2f1c4c8fe2fe009758c986938ed8c082151ce984608113def20924d444fafd2c90d09f305d0f252920f61af737dfc89

data/lib/bowie.rb

@@ -8,10 +8,6 @@ require "bowie/utils"
 require "bowie/semver"
 
 module Bowie
-  
-  @songs
-  @local_songs
-  @local_lyrics
 
   # Retrive the online registry of available songs
   def self.get_songs
@@ -63,15 +59,31 @@ module Bowie
 
     if songs.length > 0
       songs.each do |song|
-        name = @songs[song]['name']
-        url = @songs[song]['url']
+        name = Utils.parse_song_name song
+        version = Semver.new(Utils.parse_song_version song)
+        url = @songs[name]['url']
         path = "bowie_songs/#{name}"
 
-        FileUtils.mkdir_p(path)
-        Git.clone(url, path)
+        if File.directory? path
+          self.update(name)
+        else
+          FileUtils.mkdir_p(path)
+          Git.clone(url, path)
+          if version.major != nil
+            g = Git.open(path)
+            begin
+              g.checkout(version.to_s)
+            rescue
+              begin
+                g.checkout(version.to_s :v => true)
+              rescue
+              end
+            end
+          end
+        end
 
-        unless @local_songs.include? song
-          @local_songs.push song
+        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)
         end
         File.open("songs.yml", "w"){|f| YAML.dump(@local_songs, f)}
       end
@@ -86,12 +98,17 @@ module Bowie
     @local_songs = self.get_local_songs
 
     songs.each do |song|
-      name = @songs[song]['name']
+      name = Utils.parse_song_name song
+      version = Semver.new(Utils.parse_song_version song)
       path = "bowie_songs/#{name}"
 
       FileUtils.rm_rf(path) # use remove_entry_secure for security reasons?
 
-      @local_songs.delete song
+      if version.major != nil
+        @local_songs.delete "#{name}##{version}"
+      else
+        @local_songs.delete_if {|el| not (el =~ /^#{name}#/).nil?}
+      end
       File.open("songs.yml", "w"){|f| YAML.dump(@local_songs, f)}
     end
   end
@@ -103,12 +120,27 @@ module Bowie
 
     if songs.length > 0
       songs.each do |song|
-        name = @songs[song]['name']
+        name = Utils.parse_song_name song
+        version = Semver.new(Utils.parse_song_version song)
         path = "bowie_songs/#{name}"
 
         g = Git.open(path, :log => Logger.new(STDOUT))
         g.reset_hard('HEAD')
         g.pull
+        unless version.major.nil?
+          begin
+            g.checkout(version.to_s)
+          rescue
+            begin
+              g.checkout(version.to_s :v => true)
+            rescue
+            end
+          end
+        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)
+        File.open("songs.yml", "w"){|f| YAML.dump(@local_songs, f)}
       end
     else
       @local_songs.each {|song| self.update(song)}

data/lib/bowie/semver.rb

@@ -16,15 +16,19 @@ class Semver
         @minor = Integer v[1]
         @patch = Integer v[2]
       else
-        p 'error'
+        false
       end
     else
-      p 'error'
+      false
     end
   end
 
   def to_s opts = {}
-    opts[:v]? "v#{@major}.#{minor}.#{patch}" : "#{@major}.#{minor}.#{patch}"
+    if(@major.nil? or @minor.nil? or patch.nil?)
+      return ""
+    else
+      opts[:v]? "v#{@major}.#{@minor}.#{@patch}" : "#{@major}.#{@minor}.#{@patch}"
+    end
   end
 
   def bump *type

data/lib/bowie/utils.rb

@@ -1,3 +1,5 @@
+require "git"
+
 module Bowie
   module Utils
 
@@ -22,5 +24,14 @@ module Bowie
       s.split("#")[1]
     end
 
+    def self.get_git_tags(path)
+      result = Array.new
+      g = Git.open(path)
+      g.tags.each do |tag|
+        result.push tag.name
+      end
+      return result
+    end
+
   end
 end

data/lib/bowie/version.rb

@@ -1,3 +1,3 @@
 module Bowie
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

metadata

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