mspac 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b6590cb8c98b4d7b74bdec0c666a1cdf36dafae
-  data.tar.gz: 335b53ae4914efdf3b07804ace2c4fc79a0622d2
+  metadata.gz: 6d5a3955b6bd3f52aeb79bcd9203ba0e18761100
+  data.tar.gz: 58d343c04ae9e2839dabb5ae40d50ea6a6a8d2d5
 SHA512:
-  metadata.gz: 73325d405110ace0162e9ba368a4e686631e7864ba83b979d0d777e777c18ad0632e890fa5060c1166d47843be67cbacbfb7fb98834111ca6cd7b498ba8fe362
-  data.tar.gz: c837b8963050a62419020d15bae674f8780a594962eefe7fd3b74a10c642f3285f5803582e1bf9b1dd94e737183debd55b31f3b7ac0afd1051feae178227f191
+  metadata.gz: 01cc8be8b59bb4ec74aa751b0f73235ca0d13405ca2fee19b7585d5895a4d09c5746d8dc2a9fd8a81d1ea59a3ef850e02abf20b2f43323eb80b97a28a134f7c0
+  data.tar.gz: e190d0e2d9ef39a93cde48d73b9e57b227c6779fa5a056755db47eb660db9c4c614e7e0b17d36b16b082622eb96dd617c125e6872bf546ec01f27d505c8e4e6d

data/bin/mspac

@@ -26,13 +26,18 @@ end
 
 def parse(args)
     options = Hash.new
+    options["operation"] = nil
+
+    # Sync options
     options["clean"] = false
     options["force"] = false
-    options["nosave"] = false
-    options["operation"] = nil
     options["refresh"] = false
+    options["regex"] = false
     options["upgrade"] = false
 
+    # Remove options
+    options["nosave"] = false
+
     parser = OptionParser.new do |opts|
         opts.banner =
             "Usage: #{File.basename($0)} <operation> [OPTIONS] " \
@@ -101,12 +106,7 @@ def parse(args)
             "Remove pellets that are no longer installed",
             "from the cache"
         ) do
-            if (options["operation"] == Operation::SYNC)
-                options["clean"] = true
-            else
-                puts opts
-                exit MsPacExit::INVALID_OPERATION
-            end
+            options["clean"] = true
         end
 
         opts.on(
@@ -114,65 +114,30 @@ def parse(args)
             "--force",
             "Force a reinstall/recompilation of the pellet"
         ) do
-            if (options["operation"] == Operation::SYNC)
-                options["force"] = true
-            else
-                puts opts
-                exit MsPacExit::INVALID_OPERATION
-            end
+            options["force"] = true
         end
 
         opts.on(
             "-s",
-            "--search=regex",
+            "--search",
             "Search each pellet for names matching the",
             "provided regex and display them"
-        ) do |regex|
-            if (
-                (options["operation"] == Operation::SYNC) &&
-                !options["upgrade"]
-            )
-                options["regex"] = regex
-            else
-                puts opts
-                exit MsPacExit::INVALID_OPERATION
-            end
+        ) do
+            options["regex"] = true
         end
 
         opts.on("-u", "--sysupgrade", "Upgrade all pellets") do
-            if (
-                (options["operation"] == Operation::SYNC) &&
-                !options.has_key?("regex")
-            )
-                options["upgrade"] = true
-            else
-                puts opts
-                exit MsPacExit::INVALID_OPERATION
-            end
+            options["upgrade"] = true
         end
 
         opts.on("-y", "--refresh", "Refresh available pellets") do
-            if (options["operation"] == Operation::SYNC)
-                options["refresh"] = true
-            else
-                puts opts
-                exit MsPacExit::INVALID_OPERATION
-            end
+            options["refresh"] = true
         end
 
         opts.on("", "REMOVE OPTIONS")
 
-        opts.on(
-            "-n",
-            "--nosave",
-            "Completely remove pellet"
-        ) do
-            if (options["operation"] == Operation::REMOVE)
-                options["nosave"] = true
-            else
-                puts opts
-                exit MsPacExit::INVALID_OPERATION
-            end
+        opts.on("-n", "--nosave", "Completely remove pellet") do
+            options["nosave"] = true
         end
     end
 
@@ -192,16 +157,126 @@ def parse(args)
         exit MsPacExit::MISSING_ARGUMENT
     end
 
-    options["pellets"] = args
-
-    if (options.has_key?("regex") && !options["pellets"].empty?)
+    if (!validate(options))
         puts parser
         exit MsPacExit::INVALID_OPERATION
     end
 
+    options["pellets"] = args
+
     return options
 end
 
+def validate(options)
+    case options["operation"]
+    when Operation::LIST_CACHED
+        if (
+            options["clean"] ||
+            options["force"] ||
+            options["nosave"] ||
+            options["refresh"] ||
+            options["regex"] ||
+            options["upgrade"]
+        )
+            return false
+        end
+    when Operation::LIST_INSTALLED
+        if (
+            options["clean"] ||
+            options["force"] ||
+            options["nosave"] ||
+            options["refresh"] ||
+            options["regex"] ||
+            options["upgrade"]
+        )
+            return false
+        end
+    when Operation::LIST_PELLETS
+        if (
+            options["clean"] ||
+            options["force"] ||
+            options["nosave"] ||
+            options["refresh"] ||
+            options["regex"] ||
+            options["upgrade"]
+        )
+            return false
+        end
+    when Operation::LOCK
+        if (
+            options["clean"] ||
+            options["force"] ||
+            options["nosave"] ||
+            options["refresh"] ||
+            options["regex"] ||
+            options["upgrade"]
+        )
+            return false
+        end
+    when Operation::REMOVE
+        if (
+            options["clean"] ||
+            options["force"] ||
+            options["refresh"] ||
+            options["regex"] ||
+            options["upgrade"]
+        )
+            return false
+        end
+    when Operation::SYNC
+        return false if (options["nosave"])
+
+        if (options["clean"])
+            if (
+                options["force"] ||
+                options["regex"] ||
+                options["upgrade"]
+            )
+                return false
+            end
+        elsif (options["force"])
+            if (
+                options["clean"] ||
+                options["regex"] ||
+                options["upgrade"]
+            )
+                return false
+            end
+        elsif (options["regex"])
+            if (
+                options["clean"] ||
+                options["force"] ||
+                options["upgrade"]
+            )
+                return false
+            end
+        elsif (options["upgrade"])
+            if (
+                options["clean"] ||
+                options["force"] ||
+                options["regex"]
+            )
+                return false
+            end
+        end
+    when Operation::UNLOCK
+        if (
+            options["clean"] ||
+            options["force"] ||
+            options["nosave"] ||
+            options["refresh"] ||
+            options["regex"] ||
+            options["upgrade"]
+        )
+            return false
+        end
+    else
+        return false
+    end
+
+    return true
+end
+
 # Parse CLI args
 options = parse(ARGV)
 
@@ -220,16 +295,17 @@ begin
     when Operation::REMOVE
         mspac.remove(options["pellets"], options["nosave"])
     when Operation::SYNC
-        mspac.clean if (options["clean"])
         mspac.refresh if (options["refresh"])
 
-        if (options.has_key?("regex"))
-            mspac.search(options["regex"])
+        if (options["clean"])
+            mspac.clean
+        elsif (options["regex"])
+            mspac.search(options["pellets"].join(" "))
         elsif (options["upgrade"])
             mspac.upgrade
         else
             unless (
-                (options["clean"] || options["refresh"]) &&
+                options["refresh"] &&
                 (options["pellets"].nil? || options["pellets"].empty?)
             )
                 mspac.install(options["pellets"], options["force"])

data/lib/mspac/pellet.rb

@@ -50,6 +50,7 @@ class MsPac::Pellet < Hash
         else
             Dir.chdir(@@cache_dir) do
                 @vcs.clone(self["repo"])
+                @vcs.ignore_file_perms(name)
             end
         end
     end

data/lib/mspac/version_control.rb

@@ -10,6 +10,19 @@ class MsPac::VersionControl
         end
     end
 
+    def ignore_file_perms(name)
+        Dir.chdir(name) do
+            case @vcs
+            when "git"
+                system("git config core.filemode false")
+            when "hg"
+                # do nothing
+            else
+                raise Error::UnsupportedVCSError.new(@vcs)
+            end
+        end
+    end
+
     def initialize(vcs)
         case vcs
         when "bzr"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mspac
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Miles Whittaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-06 00:00:00.000000000 Z
+date: 2015-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: scoobydoo