mpx 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 416522ba4a16b6f0cb8f011d69c11d2da7983293eedbf58e9d2d02ff750de6ef
-  data.tar.gz: '0059e3dfd1c5ab4d2a872b4432a5992dc95024ed1f93841615cd66ed927255a6'
+  metadata.gz: 58b55c6f109c0b826001f54e1e45cafb056fce54b95a84236b8d42deec4695be
+  data.tar.gz: 7e4971446131b02ad9a76ea049ee79a5bbf27b34a660bd04972aa9c210df2d0d
 SHA512:
-  metadata.gz: 2c6d22ea2c4eda0f8dc2186f42be121706c92e2ec250f52218c664408eec6d04e16a2fb156c65a9927b082520963e4f6c3dab4fb240253cab6ee4fa3c542df60
-  data.tar.gz: c854c03324af78f14904118b3d93821b5a6b3f1b488efa2a494a90efb48c85b3898cff0cbf4e97e8110515f84b98c773659c6193d05c85a580c324f538f91088
+  metadata.gz: cdb2d170667aba13ec3be1a6c2efd3b28af442309fbb4af551888cad7061f36bf08b3cd3cbdf8fdb845f71bd0913105a5e4781c636421b4cc99398b6774764ea
+  data.tar.gz: 664f5de4798bb1213025fcf784cc679529bb334a9ccd16859de3e250f0bd465f033142dee204fd2fd3dd6cbdacc67f9f6a72e1d935033ee0a0959939861bf0f0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mpx (0.1.1)
+    mpx (0.1.2)
       ansi (~> 1.5)
 
 GEM

data/README.md

@@ -4,7 +4,7 @@
 A command multiplexer.
 
 The root folder MPX_ROOT is an environment variable
-which defaults to `~/.local/mpx`.
+which defaults to `$XDG_DATA_HOME/mpx`, i.e. `~/.local/share/mpx`.
 
 The following subfolders are used:
 - `bin`     Where commands are stored.

data/lib/mpx/cli.rb

@@ -8,7 +8,7 @@ module Mpx
 A command multiplexer.
 
 The root folder MPX_ROOT is an environment variable
-which defaults to `~/.local/mpx`.
+which defaults to `$XDG_DATA_HOME/mpx`, i.e. `~/.local/share/mpx`.
 
 The following subfolders are used:
 - `bin`     Where commands are stored.
@@ -30,6 +30,10 @@ The first argument is a mandatory operation, and should be one of:
 
   Prints the version.
 
+`list`
+
+  Prints the available commands to run.
+
 `history`
 
   Taking each subsequent argument as a command or set, the history of each
@@ -58,7 +62,7 @@ EOF
   class Cli
     Usage = "Usage: #{File.basename($0)} [operation] [args...]"
     MpxRoot = 'MPX_ROOT'
-    DefaultRoot = File.join('.local', 'mpx')
+    RootFolder = 'mpx'
 
     def self.start
       op, *args = ARGV
@@ -67,6 +71,8 @@ EOF
         self.help
       when 'version'
         self.version
+      when 'list'
+        self.list
       when 'history'
         self.history(args)
       when nil
@@ -91,14 +97,18 @@ EOF
       puts Mpx::VERSION
     end
 
+    def self.list
+      puts Loader.new(self.get_root).list
+    end
+
     def self.history(args)
-      history = Loader.new(self.root).history
+      history = Loader.new(self.get_root).history
       puts history.get(*args)
     end
 
     def self.run(args)
+      loader = Loader.new(self.get_root)
       request = Request.new(args)
-      loader = Loader.new(self.root)
       commands = loader.load(request.name).sort
       history = loader.history
 
@@ -116,18 +126,27 @@ EOF
       end
     end
 
+    def self.get_root
+      root = self.root
+      raise 'Unable to determine root folder' unless root
+      raise 'Root folder does not exist' unless File.directory?(root)
+      return root
+    end
+
     def self.root
       root = ENV[MpxRoot]
-      if root
-        return root
-      end
+      return root if root
 
-      home = ENV['HOME']
-      if !home
-        raise "#{MpxRoot} and $HOME are both not set"
-      end
+      data_home = self.data_home
+      return File.join(data_home, RootFolder) if data_home
+    end
+
+    def self.data_home
+      data_home = ENV['XDG_DATA_HOME']
+      return data_home if data_home
 
-      return File.join(home, DefaultRoot)
+      home = ENV['HOME']
+      return File.join(home, '.local', 'share') if home
     end
   end
 end

data/lib/mpx/history.rb

@@ -6,8 +6,6 @@ module Mpx
   class History
     def initialize(root)
       @root = root
-
-      FileUtils.mkdir_p(@root)
     end
 
     def now

data/lib/mpx/loader.rb

@@ -14,23 +14,32 @@ module Mpx
       @bin = File.join(root, BinFolder)
       @spaces = File.join(root, SpacesFolder)
       @sets = File.join(root, SetsFolder)
-      @history = History.new(File.join(root, HistoryFolder))
-    end
+      @history = File.join(root, HistoryFolder)
 
-    def load(name)
-      if name.nil?
-        return load_all
-      end
+      FileUtils.mkdir_p(@bin)
+      FileUtils.mkdir_p(@spaces)
+      FileUtils.mkdir_p(@sets)
+      FileUtils.mkdir_p(@history)
 
-      return [load_command(name)]
-    rescue
-      return load_set(name)
+      @history_obj = History.new(@history)
     end
 
-    def load_all
+    def list
       return Dir.entries(@bin)
         .select { |f| File.file?(File.join(@bin, f)) }
-        .map { |file| load_command(file) }
+    end
+
+    def history
+      @history_obj
+    end
+
+    def load(name)
+      return load_all if name.nil?
+      return [load_command(name)] rescue load_set(name)
+    end
+
+    def load_all
+      return list.map { |file| load_command(file) }
     end
 
     def load_command(command)
@@ -55,9 +64,5 @@ module Mpx
         .uniq
         .map { |line| load_command(line.strip) }
     end
-
-    def history
-      @history
-    end
   end
 end

data/lib/mpx/version.rb

@@ -1,3 +1,3 @@
 module Mpx
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mpx
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Ethan Chan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-31 00:00:00.000000000 Z
+date: 2019-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ansi
@@ -128,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: A command multiplexer.