bowie 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a1627386c87e3785efd62c3c32e9a2e05a89863
-  data.tar.gz: 961ca9b6ee29c6a7db3ce15a50741119b83985b2
+  metadata.gz: ececbde1cb3bb56582f6aa35aea67de68231f8b6
+  data.tar.gz: 46f9875461219c7b698b91f9806db72bd7096b1e
 SHA512:
-  metadata.gz: 2b17b0c8664ad75cf4b12ca14b3a5799096e4f35382530075ea8be0d2fa50f4e0d388e844ae0800466171a071a3330cc1e400aa8433435b1fc2a7eeb0eb07eda
-  data.tar.gz: 15b9cac6ae41dca43c96b1c60c882c3cb2f1c4c8fe2fe009758c986938ed8c082151ce984608113def20924d444fafd2c90d09f305d0f252920f61af737dfc89
+  metadata.gz: 6a727b62aa104ca86b9935f8574c910abd3c23d5361e0eb9a63ddac494774c224c366599ba18842173a0e8c1696d16b8708791eabd5888ff5768a32171c6b6df
+  data.tar.gz: 6605c234da1ce24f14ea541f910fcd554e292a4ca89b6b1fa9713b82823ca1977e0ec06b8d810947f17519467fc9c089744859ad51a84caed90cc03d2da496a1

data/bin/bowie

@@ -1,45 +1,5 @@
 #!/usr/bin/env ruby
 
 require 'bowie'
-require 'thor'
 
-class BowieCLI < Thor
-
-  Bowie.get_songs
-  Bowie.get_local_songs
-  Bowie.get_local_lyrics
-  
-  desc "install [song]", "install the selected package"
-  def install(*songs)
-    Bowie.install(*songs)
-  end
-
-  desc "update [song]", "update the selected package"
-  def update(*songs)
-    Bowie.update(*songs)
-  end
-
-  desc "uninstall [song]", "remove the selected package"
-  def uninstall(*songs)
-    Bowie.uninstall(*songs)
-  end
-
-  desc "search [song]", "list all availables packages matching [song]"
-  def search(song)
-    results = Bowie.search(song)
-    results.each { |key, values| puts "#{values['name']}:\n  #{values['description']}" }
-  end
-
-  desc "prune", "remove all the packages not included in songs.yml"
-  def prune
-    Bowie.prune
-  end
-
-  desc "list", "list all the installed packages"
-  def list
-    results = Bowie.list
-    results.each { |key, values| puts "#{values['name']}:\n  #{values['description']}" }
-  end
-end
-
-BowieCLI.start(ARGV)
+Bowie::CLI.start(ARGV)

data/bowie.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
 
   spec.add_runtime_dependency "git"
   spec.add_runtime_dependency "thor"

data/lib/bowie.rb

@@ -4,166 +4,8 @@ require "open-uri"
 require "fileutils"
 require "git"
 require "logger"
+require "semver/semver"
 require "bowie/utils"
-require "bowie/semver"
-
-module Bowie
-
-  # Retrive the online registry of available songs
-  def self.get_songs
-    begin
-      YAML.parse(open("https://raw.github.com/axyz/bowie-songs/master/songs.yml")).to_ruby
-    rescue
-      puts "ERROR: 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 
-      end
-      FileUtils.touch 'songs.yml'
-      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
-      end
-      FileUtils.touch 'bowie_songs/lyrics.yml'
-      return Hash.new
-    end
-  end
-
-  # Return a printable list of available packages matching the [query]
-  def self.search(query)
-    @songs = self.get_songs
-    @songs.select { |el| /.*#{query}.*/ =~ el }
-  end
-
-  # Install the selected [song] in the bowie_songs directory
-  def self.install(*songs)
-    @songs = self.get_songs
-    @local_songs = self.get_local_songs
-
-    if songs.length > 0
-      songs.each do |song|
-        name = Utils.parse_song_name song
-        version = Semver.new(Utils.parse_song_version song)
-        url = @songs[name]['url']
-        path = "bowie_songs/#{name}"
-
-        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? 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
-    else
-      @local_songs.each {|song| self.install(song)}
-    end
-  end
-
-  # Remove the selected package
-  def self.uninstall(*songs)
-    @songs = self.get_songs
-    @local_songs = self.get_local_songs
-
-    songs.each do |song|
-      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?
-
-      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
-
-  # Update the selected package
-  def self.update(*songs)
-    @songs = self.get_songs
-    @local_songs = self.get_local_songs
-
-    if songs.length > 0
-      songs.each do |song|
-        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)}
-    end
-  end
-
-  # Remove all the packages not included in songs.yml
-  def self.prune
-    @local_songs = self.get_local_songs
-    
-    Utils.get_songs_dirs.each do |dir|
-      unless @local_songs.include? dir
-        FileUtils.rm_rf("bowie_songs/#{dir}")
-      end
-    end
-  end
-
-  # List all the installed packages
-  def self.list
-    @local_songs = self.get_local_songs
-    @songs = self.get_songs
-
-    @songs.select {|el| @local_songs.include? el}
-  end
-
-end
+require "semver/semver"
+require "bowie/actions"
+require "bowie/cli"

data/lib/bowie/actions.rb

@@ -0,0 +1,7 @@
+require 'bowie/song_utils'
+require 'bowie/actions/install'
+require 'bowie/actions/list'
+require 'bowie/actions/prune'
+require 'bowie/actions/search'
+require 'bowie/actions/uninstall'
+require 'bowie/actions/update'

data/lib/bowie/actions/install.rb

@@ -0,0 +1,42 @@
+module Bowie
+  module Actions
+    def self.install(*songs)
+      @songs = SongUtils.get_songs
+      @local_songs = SongUtils.get_local_songs
+
+      if songs.length > 0
+        songs.each do |song|
+          name = SongUtils.parse_song_name song
+          version = Semver.new(SongUtils.parse_song_version song)
+          url = @songs[name]['url']
+          path = "bowie_songs/#{name}"
+
+          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? 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
+      else
+        @local_songs.each {|song| self.install(song)}
+      end
+    end
+  end
+end

data/lib/bowie/actions/list.rb

@@ -0,0 +1,11 @@
+module Bowie
+  module Actions
+    # List all the installed packages
+    def self.list
+      @local_songs = SongUtils.get_local_songs
+      @songs = SongUtils.get_songs
+
+      @songs.select {|el| @local_songs.include? el}
+    end
+  end
+end

data/lib/bowie/actions/prune.rb

@@ -0,0 +1,14 @@
+module Bowie
+  module Actions
+    # Remove all the packages not included in songs.yml
+    def self.prune
+      @local_songs = SongUtils.get_local_songs
+      
+      SongUtils.get_songs_dirs.each do |dir|
+        unless @local_songs.include? dir
+          FileUtils.rm_rf("bowie_songs/#{dir}")
+        end
+      end
+    end
+  end
+end

data/lib/bowie/actions/search.rb

@@ -0,0 +1,9 @@
+module Bowie
+  module Actions
+    # Return a printable list of available packages matching the [query]
+    def self.search(query)
+      @songs = SongUtils.get_songs
+      @songs.select { |el| /.*#{query}.*/ =~ el }
+    end
+  end
+end

data/lib/bowie/actions/uninstall.rb

@@ -0,0 +1,24 @@
+module Bowie
+  module Actions
+    # Remove the selected package
+    def self.uninstall(*songs)
+      @songs = SongUtils.get_songs
+      @local_songs = SongUtils.get_local_songs
+
+      songs.each do |song|
+        name = SongUtils.parse_song_name song
+        version = Semver.new(SongUtils.parse_song_version song)
+        path = "bowie_songs/#{name}"
+
+        FileUtils.rm_rf(path) # use remove_entry_secure for security reasons?
+
+        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
+  end
+end

data/lib/bowie/actions/update.rb

@@ -0,0 +1,37 @@
+module Bowie
+  module Actions
+    # Update the selected package
+    def self.update(*songs)
+      @songs = SongUtils.get_songs
+      @local_songs = SongUtils.get_local_songs
+
+      if songs.length > 0
+        songs.each do |song|
+          name = SongUtils.parse_song_name song
+          version = Semver.new(SongUtils.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)}
+      end
+    end
+  end
+end

data/lib/bowie/cli.rb

@@ -0,0 +1,42 @@
+require 'thor'
+
+module Bowie
+  class CLI < Thor
+
+    SongUtils.get_songs
+    SongUtils.get_local_songs
+    SongUtils.get_local_lyrics
+    
+    desc "install [song]", "install the selected package"
+    def install(*songs)
+      Actions.install(*songs)
+    end
+
+    desc "update [song]", "update the selected package"
+    def update(*songs)
+      Actions.update(*songs)
+    end
+
+    desc "uninstall [song]", "remove the selected package"
+    def uninstall(*songs)
+      Actions.uninstall(*songs)
+    end
+
+    desc "search [song]", "list all availables packages matching [song]"
+    def search(song)
+      results = Bowi::Actions.search(song)
+      results.each { |key, values| puts "#{values['name']}:\n  #{values['description']}" }
+    end
+
+    desc "prune", "remove all the packages not included in songs.yml"
+    def prune
+      Actions.prune
+    end
+
+    desc "list", "list all the installed packages"
+    def list
+      results = Actions.list
+      results.each { |key, values| puts "#{values['name']}:\n  #{values['description']}" }
+    end
+  end
+end

data/lib/bowie/song_utils.rb

@@ -0,0 +1,61 @@
+module Bowie
+  module SongUtils
+    # Retrive the online registry of available songs
+    def self.get_songs
+      begin
+        YAML.parse(open("https://raw.github.com/axyz/bowie-songs/master/songs.yml")).to_ruby
+      rescue
+        puts "ERROR: 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 
+        end
+        FileUtils.touch 'songs.yml'
+        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
+        end
+        FileUtils.touch 'bowie_songs/lyrics.yml'
+        return Hash.new
+      end
+    end
+
+    # Return an array with all the direcotry inside bowye_songs
+    def self.get_songs_dirs
+      result = []
+      Dir.foreach('bowie_songs') do |el|
+        unless (el == "." or el == ".." or el == "lyrics.yml")
+          result.push el
+        end
+      end
+      result
+    end
+
+    # Parse the name of a package in the form name#version
+    def self.parse_song_name(s)
+      s.split("#")[0]
+    end
+
+    # Parse the version of a package in the form name#version
+    def self.parse_song_version(s)
+      s.split("#")[1]
+    end
+  end
+end

data/lib/bowie/utils.rb

@@ -3,27 +3,6 @@ require "git"
 module Bowie
   module Utils
 
-    # Return an array with all the direcotry inside bowye_songs
-    def self.get_songs_dirs
-      result = []
-      Dir.foreach('bowie_songs') do |el|
-        unless (el == "." or el == ".." or el == "lyrics.yml")
-          result.push el
-        end
-      end
-      result
-    end
-
-    # Parse the name of a package in the form name#version
-    def self.parse_song_name(s)
-      s.split("#")[0]
-    end
-
-    # Parse the version of a package in the form name#version
-    def self.parse_song_version(s)
-      s.split("#")[1]
-    end
-
     def self.get_git_tags(path)
       result = Array.new
       g = Git.open(path)

data/lib/bowie/version.rb

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

data/spec/bowie_spec.rb

@@ -0,0 +1,5 @@
+require 'rspec'
+require './lib/bowie'
+
+Describe Bowie do
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bowie
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Andrea Moretti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-14 00:00:00.000000000 Z
+date: 2013-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
@@ -82,9 +96,19 @@ files:
 - bin/bowie
 - bowie.gemspec
 - lib/bowie.rb
-- lib/bowie/semver.rb
+- lib/bowie/actions.rb
+- lib/bowie/actions/install.rb
+- lib/bowie/actions/list.rb
+- lib/bowie/actions/prune.rb
+- lib/bowie/actions/search.rb
+- lib/bowie/actions/uninstall.rb
+- lib/bowie/actions/update.rb
+- lib/bowie/cli.rb
+- lib/bowie/song_utils.rb
 - lib/bowie/utils.rb
 - lib/bowie/version.rb
+- lib/semver/semver.rb
+- spec/bowie_spec.rb
 homepage: http://axyz.github.io/bowie/
 licenses:
 - MIT
@@ -109,4 +133,5 @@ rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: The White Duke rules them all
-test_files: []
+test_files:
+- spec/bowie_spec.rb