mspac 0.2.7 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 505169a560cee6762ad4d33918457e7e7b0fe3ee
-  data.tar.gz: fc80f7d307db2fcd808a5422a0ee1605da4388ca
+  metadata.gz: bc9b4c5cf07936d804430a524e80596432812d75
+  data.tar.gz: d5b8fd7f13e87f73ee15f9fb6e22899dc3daf565
 SHA512:
-  metadata.gz: 90ed333ff3a3422630f0193d418f9442d2acfd44945722ef14f7fd0237d4e1f2f79209dadb64790cd3ebbeeba67a2c736faedf10fc47e12433120f156195a893
-  data.tar.gz: 976dcc5a5aa886186cf278cb5a1895621bfe18be1c2d5300abe80036c8ec8b24af05090483a69bab2f3bd0fcbe75e8f3e5fa3cd6b5f48d7def2b6d1255170189
+  metadata.gz: 3cd180a86cf6980c36ba81d70684e9e4856208322aeb46896a5b66105c531d44a8a54e088f5e0a20a15c51ae06cee30d6700902761e5f32dd59b0f90175957ab
+  data.tar.gz: 45ab1681fdca5555b13cb8a6abfa38f76bf24e7d558d15523137b82f2f9fc07d3d71ad48ee7e35c8abe4adcaccad5ce202560422e386c04cb52d6e78acf8345b

data/lib/mspac.rb

@@ -6,8 +6,8 @@ require "scoobydoo"
 
 class MsPac
     def cached
-        return @pellets.keys.sort.delete_if do |name|
-            !@pellets[name].cached?
+        return @pellets.keys.sort.keep_if do |name|
+            @pellets[name].cached?
         end
     end
 
@@ -30,7 +30,7 @@ class MsPac
 
         @pellets_dir = Pathname.new("~/.mspac/pellets").expand_path
         if (@pellets_dir.nil? || !@pellets_dir.exist?)
-            raise Error::PelletRepoError.new
+            raise Error::PelletRepo.new
         end
     end
     private :ensure_pellets_repo
@@ -56,14 +56,14 @@ class MsPac
         @@hilight = hilight
         FileUtils.mkdir_p(Pathname.new("~/.mspac").expand_path)
         @mspac_dir = Pathname.new("~/.mspac").expand_path
-        @pm = PackageManager.new
+        @pm = PackageManager.new(self)
         @vcs = VersionControl.new("git")
         load_pellets
     end
 
     def install(pellets, force = false)
         if (pellets.nil? || pellets.empty?)
-            raise Error::MissingPelletError.new
+            raise Error::MissingPellet.new
         end
 
         pellets.each do |name|
@@ -79,7 +79,7 @@ class MsPac
                     pellet.install
                 end
             else
-                raise Error::MissingPelletError.new(name)
+                raise Error::MissingPellet.new(name)
             end
         end
     end
@@ -96,7 +96,7 @@ class MsPac
         @pellets = Hash.new
         Dir["#{@pellets_dir}/*.pellet"].each do |pellet|
             begin
-                p = Pellet.new(JSON.parse(File.read(pellet)))
+                p = Pellet.new(JSON.parse(File.read(pellet)), @pm)
                 @pellets[p.name] = p
             rescue JSON::ParserError => e
                 puts hilight_error("#{pellet} is not valid JSON!")
@@ -110,14 +110,14 @@ class MsPac
 
     def lock(pellets)
         if (pellets.nil? || pellets.empty?)
-            raise Error::MissingPelletError.new
+            raise Error::MissingPellet.new
         end
 
         pellets.each do |name|
             if (@pellets.has_key?(name))
                 @pellets[name].lock
             else
-                raise Error::MissingPelletError.new(name)
+                raise Error::MissingPellet.new(name)
             end
         end
     end
@@ -135,14 +135,14 @@ class MsPac
 
     def remove(pellets, nosave)
         if (pellets.nil? || pellets.empty?)
-            raise Error::MissingPelletError.new
+            raise Error::MissingPellet.new
         end
 
         pellets.each do |name|
             if (@pellets.has_key?(name))
                 @pellets[name].remove(nosave)
             else
-                raise Error::MissingPelletError.new(name)
+                raise Error::MissingPellet.new(name)
             end
         end
     end
@@ -158,14 +158,14 @@ class MsPac
 
     def unlock(pellets)
         if (pellets.nil? || pellets.empty?)
-            raise Error::MissingPelletError.new
+            raise Error::MissingPellet.new
         end
 
         pellets.each do |name|
             if (@pellets.has_key?(name))
                 @pellets[name].unlock
             else
-                raise Error::MissingPelletError.new(name)
+                raise Error::MissingPellet.new(name)
             end
         end
     end

data/lib/mspac/error.rb

@@ -1,8 +1,8 @@
 class MsPac::Error < RuntimeError
 end
 
-require "mspac/error/missing_pellet_error"
-require "mspac/error/pellet_not_installed_error"
-require "mspac/error/pellet_repo_error"
-require "mspac/error/unsupported_package_manager_error"
-require "mspac/error/unsupported_vcs_error"
+require "mspac/error/missing_pellet"
+require "mspac/error/pellet_not_installed"
+require "mspac/error/pellet_repo"
+require "mspac/error/unsupported_package_manager"
+require "mspac/error/unsupported_vcs"

data/lib/mspac/error/{missing_pellet_error.rb → missing_pellet.rb}

@@ -1,4 +1,4 @@
-class MsPac::Error::MissingPelletError < MsPac::Error
+class MsPac::Error::MissingPellet < MsPac::Error
     def initialize(pellet = nil)
         if (pellet)
             super("Pellet not found: #{pellet}")

data/lib/mspac/error/{pellet_not_installed_error.rb → pellet_not_installed.rb}

@@ -1,4 +1,4 @@
-class MsPac::Error::PelletNotInstalledError < MsPac::Error
+class MsPac::Error::PelletNotInstalled < MsPac::Error
     def initialize(pellet = "unknown")
         super("Pellet not installed: #{pellet}")
     end

data/lib/mspac/error/{pellet_repo_error.rb → pellet_repo.rb}

@@ -1,4 +1,4 @@
-class MsPac::Error::PelletRepoError < MsPac::Error
+class MsPac::Error::PelletRepo < MsPac::Error
     def initialize
         super("Could not update pellet repo")
     end

data/lib/mspac/error/{unsupported_package_manager_error.rb → unsupported_package_manager.rb}

@@ -1,4 +1,4 @@
-class MsPac::Error::UnsupportedPackageManagerError < MsPac::Error
+class MsPac::Error::UnsupportedPackageManager < MsPac::Error
     def initialize(pkg_mgr = "unknown")
         super("Unsupported package manager: #{pkg_mgr}")
     end

data/lib/mspac/error/{unsupported_vcs_error.rb → unsupported_vcs.rb}

@@ -1,4 +1,4 @@
-class MsPac::Error::UnsupportedVCSError < MsPac::Error
+class MsPac::Error::UnsupportedVCS < MsPac::Error
     def initialize(vcs = "unknown")
         super("Unsupported version control system: #{vcs}")
     end

data/lib/mspac/package_manager.rb

@@ -1,6 +1,7 @@
 require "scoobydoo"
 
 class MsPac::PackageManager
+    attr_reader :mspac
     attr_reader :pkgmgr
 
     def alt_install(packages, pkgmgr = @pkgmgr)
@@ -10,25 +11,27 @@ class MsPac::PackageManager
         end
     end
 
-    def initialize
+    def initialize(mspac)
+        @mspac = mspac
+
         if (ScoobyDoo.where_are_you("apt-get"))
             @pkgmgr = "apt-get"
         elsif (ScoobyDoo.where_are_you("brew"))
-            raise MsPac::Error::UnsupportedPackageManagerError.new(
+            raise MsPac::Error::UnsupportedPackageManager.new(
                 "brew"
             )
         elsif (ScoobyDoo.where_are_you("pacman"))
             @pkgmgr = "pacman"
         elsif (ScoobyDoo.where_are_you("yum"))
-            raise MsPac::Error::UnsupportedPackageManagerError.new(
+            raise MsPac::Error::UnsupportedPackageManager.new(
                 "yum"
             )
         elsif (ScoobyDoo.where_are_you("zipper"))
-            raise MsPac::Error::UnsupportedPackageManagerError.new(
+            raise MsPac::Error::UnsupportedPackageManager.new(
                 "zipper"
             )
         else
-            raise MsPac::Error::UnsupportedPackageManagerError.new
+            raise MsPac::Error::UnsupportedPackageManager.new
         end
     end
 
@@ -42,9 +45,11 @@ class MsPac::PackageManager
         when "apt-get"
             system("sudo apt-get install -y #{pkgs}")
         when "brew"
-            raise MsPac::Error::UnsupportedPackageManagerError.new(
+            raise MsPac::Error::UnsupportedPackageManager.new(
                 "brew"
             )
+        when "mspac"
+            @mspac.install(pkgs.split(" "))
         when "pacman"
             system("sudo pacman --needed --noconfirm -S #{pkgs}")
         when "perl"
@@ -54,15 +59,15 @@ class MsPac::PackageManager
         when "python3"
             system("umask 022 && sudo python3 -m pip install #{pkgs}")
         when "yum"
-            raise MsPac::Error::UnsupportedPackageManagerError.new(
+            raise MsPac::Error::UnsupportedPackageManager.new(
                 "yum"
             )
         when "zipper"
-            raise MsPac::Error::UnsupportedPackageManagerError.new(
+            raise MsPac::Error::UnsupportedPackageManager.new(
                 "zipper"
             )
         else
-            raise MsPac::Error::UnsupportedPackageManagerError.new
+            raise MsPac::Error::UnsupportedPackageManager.new
         end
     end
     private :pkgmgr_install

data/lib/mspac/pellet.rb

@@ -21,9 +21,19 @@ class MsPac::Pellet < Hash
     end
 
     def execute(operation)
-        Dir.chdir("#{@@install_dir}/#{name}") do
-            system(["umask 022"].concat(self[operation]).join("; "))
-        end if (!self[operation].empty?)
+        if (self["vcs"] != "powerpellet")
+            Dir.chdir("#{@@install_dir}/#{name}") do
+                system(
+                    ["umask 022"].concat(self[operation]).join("; ")
+                )
+            end if (!self[operation].empty?)
+        else
+            if (!self[operation].empty?)
+                system(
+                    ["umask 022"].concat(self[operation]).join("; ")
+                )
+            end
+        end
     end
     private :execute
 
@@ -47,8 +57,12 @@ class MsPac::Pellet < Hash
     end
 
     def get_deps
-        puts hilight_status("Installing dependencies...")
-        @pm.install([self["vcs"]].concat(self["deps"][@pm.pkgmgr]))
+        puts hilight_status("Installing dependencies for #{name}...")
+        deps = Array.new
+        deps.push(self["vcs"]) if (self["vcs"] != "powerpellet")
+        deps.push(self["deps"][@pm.pkgmgr])
+        @pm.install(deps)
+        @pm.install(self["deps"]["mspac"], "mspac")
         @pm.install(self["deps"]["perl"], "perl")
         @pm.install(self["deps"]["python2"], "python2")
         @pm.install(self["deps"]["python3"], "python3")
@@ -81,7 +95,7 @@ class MsPac::Pellet < Hash
     end
     private :hilight_installed
 
-    def hilight_name(name = @name)
+    def hilight_name(name)
         return name if (!MsPac.hilight?)
         return name.light_white
     end
@@ -93,18 +107,18 @@ class MsPac::Pellet < Hash
     end
     private :hilight_status
 
-    def initialize(json)
+    def initialize(json, pm)
         json.keys.each do |key|
             self[key] = json[key]
         end
 
-        @pm = MsPac::PackageManager.new
+        @pm = pm
         @vcs = MsPac::VersionControl.new(self["vcs"])
     end
 
     def install
-        if (!cached?)
-            raise MsPac::Error::PelletNotInstalledError.new(name)
+        if (!cached? && (self["vcs"] != "powerpellet"))
+            raise MsPac::Error::PelletNotInstalled.new(name)
         end
 
         link if (!installed?)
@@ -119,10 +133,12 @@ class MsPac::Pellet < Hash
     end
 
     def link
-        if (!cached?)
-            raise MsPac::Error::PelletNotInstalledError.new(name)
+        if (!cached? && (self["vcs"] != "powerpellet"))
+            raise MsPac::Error::PelletNotInstalled.new(name)
         end
 
+        return if (self["vcs"] == "powerpellet")
+
         puts hilight_status("Linking #{name}...")
         FileUtils.ln_sf(
             "#{@@cache_dir}/#{name}",
@@ -132,7 +148,7 @@ class MsPac::Pellet < Hash
 
     def lock
         if (!installed?)
-            raise MsPac::Error::PelletNotInstalledError.new(name)
+            raise MsPac::Error::PelletNotInstalled.new(name)
         end
 
         puts hilight_status("Locking #{name}...")
@@ -144,17 +160,19 @@ class MsPac::Pellet < Hash
     end
 
     def purge
-        if (!cached?)
-            raise MsPac::Error::PelletNotInstalledError.new(name)
+        if (!cached? && (self["vcs"] != "powerpellet"))
+            raise MsPac::Error::PelletNotInstalled.new(name)
         end
 
+        return if (self["vcs"] == "powerpellet")
+
         puts hilight_status("Purging #{name}...")
         FileUtils.rm_rf("#{@@cache_dir}/#{name}")
     end
 
     def remove(nosave = false)
         if (!installed?)
-            raise MsPac::Error::PelletNotInstalledError.new(name)
+            raise MsPac::Error::PelletNotInstalled.new(name)
         end
 
         puts hilight_status("Removing #{name}...")
@@ -181,7 +199,7 @@ class MsPac::Pellet < Hash
 
     def unlink
         if (!installed?)
-            raise MsPac::Error::PelletNotInstalledError.new(name)
+            raise MsPac::Error::PelletNotInstalled.new(name)
         end
 
         puts hilight_status("Unlinking #{name}...")
@@ -190,7 +208,7 @@ class MsPac::Pellet < Hash
 
     def unlock
         if (!installed?)
-            raise MsPac::Error::PelletNotInstalledError.new(name)
+            raise MsPac::Error::PelletNotInstalled.new(name)
         end
 
         puts hilight_status("Unlocking #{name}...")
@@ -199,9 +217,11 @@ class MsPac::Pellet < Hash
 
     def update(force = false)
         if (!installed?)
-            raise MsPac::Error::PelletNotInstalledError.new(name)
+            raise MsPac::Error::PelletNotInstalled.new(name)
         end
 
+        return if (self["vcs"] == "powerpellet")
+
         Dir.chdir("#{@@install_dir}/#{name}") do
             if (Pathname.new(".mspac_lock").expand_path.exist?)
                 puts hilight_error("Locked: #{name}")

data/lib/mspac/version_control.rb

@@ -5,47 +5,51 @@ class MsPac::VersionControl
         case @vcs
         when "git", "hg"
             system("#{@vcs} clone #{repo}")
+        when "powerpellet"
+            # do nothing
         else
-            raise Error::UnsupportedVCSError.new(@vcs)
+            raise MsPac::Error::UnsupportedVCS.new(@vcs)
         end
     end
 
     def ignore_file_perms(name)
-        Dir.chdir(name) do
-            case @vcs
-            when "git"
+        case @vcs
+        when "git"
+            Dir.chdir(name) do
                 system("git config core.filemode false")
-            when "hg"
-                # do nothing
-            else
-                raise Error::UnsupportedVCSError.new(@vcs)
             end
+        when "hg", "powerpellet"
+            # do nothing
+        else
+            raise MsPac::Error::UnsupportedVCS.new(@vcs)
         end
     end
 
     def initialize(vcs)
         case vcs
         when "bzr"
-            raise Error::UnsupportedVCSError.new(vcs)
-        when "git"
-            @vcs = vcs
-        when "hg"
+            raise MsPac::Error::UnsupportedVCS.new(vcs)
+        when "git", "hg", "powerpellet"
             @vcs = vcs
         when "svn"
-            raise Error::UnsupportedVCSError.new(vcs)
+            raise MsPac::Error::UnsupportedVCS.new(vcs)
         else
-            raise Error::UnsupportedVCSError.new
+            raise MsPac::Error::UnsupportedVCS.new
         end
     end
 
     def revision
         case @vcs
         when "git"
-            %x(git log --oneline | head -n 1 | awk '{print $1}')
+            return %x(
+                git log --oneline | head -n 1 | awk '{print $1}'
+            )
         when "hg"
-            %(hg tip --template "{node}")
+            return %(hg tip --template "{node}")
+        when "powerpellet"
+            return "powerpellet"
         else
-            raise Error::UnsupportedVCSError.new(@vcs)
+            raise MsPac::Error::UnsupportedVCS.new(@vcs)
         end
     end
 
@@ -55,8 +59,10 @@ class MsPac::VersionControl
             system("git reset && git pull")
         when "hg"
             system("hg pull && hg update")
+        when "powerpellet"
+            # do nothing
         else
-            raise Error::UnsupportedVCSError.new(@vcs)
+            raise MsPac::Error::UnsupportedVCS.new(@vcs)
         end
     end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mspac
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.3.0
 platform: ruby
 authors:
 - Miles Whittaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-24 00:00:00.000000000 Z
+date: 2016-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -39,7 +39,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.3
 - !ruby/object:Gem::Dependency
   name: scoobydoo
   requirement: !ruby/object:Gem::Requirement
@@ -84,11 +84,11 @@ files:
 - bin/mspac
 - lib/mspac.rb
 - lib/mspac/error.rb
-- lib/mspac/error/missing_pellet_error.rb
-- lib/mspac/error/pellet_not_installed_error.rb
-- lib/mspac/error/pellet_repo_error.rb
-- lib/mspac/error/unsupported_package_manager_error.rb
-- lib/mspac/error/unsupported_vcs_error.rb
+- lib/mspac/error/missing_pellet.rb
+- lib/mspac/error/pellet_not_installed.rb
+- lib/mspac/error/pellet_repo.rb
+- lib/mspac/error/unsupported_package_manager.rb
+- lib/mspac/error/unsupported_vcs.rb
 - lib/mspac/package_manager.rb
 - lib/mspac/pellet.rb
 - lib/mspac/version_control.rb