dotman-bin 2.0.3 → 2.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bbc499a53d21be671c68e1c87672d5e6e76eff4f278572b58511c1a08a4b8953
-  data.tar.gz: 5d0cbd3cdfaad20dc5c264860f680e2dcea2e1aab26319f5f3b506076cac799a
+  metadata.gz: b7996be636ad86d7132d39ea51e97d8de901130f5a3366c11f36ff0a1f8b7e07
+  data.tar.gz: a178d6482f4cc1b80dbf5f8b0886f3d137acfcce0f64b330638f8ecce8932528
 SHA512:
-  metadata.gz: 6efaf3e3734b95a796d4274a4a4ff986c63ef28512944e712357c3d539a69b3d0ccc870213b9267ea83c40b5468e24f7e3a03fd3bfeea10f683abc1c84b94e91
-  data.tar.gz: 7a7f73bb7dfffd5925f15b54a22557565ba0fa59e1807ca7a1c900f8f202431b0e8c18823de661d752d57664a2215a952f7fd68f25433fb586cd5e98df2ca197
+  metadata.gz: 2c82ef0087598bff8cbc4f94fdf47cd5d3f249a5b3d97d6c6644eeaf682e9b3a22d3529426333a174a6bdba1a0f276817448f04da3c9226334f33b5ff22de65a
+  data.tar.gz: 557fd72ffbfa49a9cf15a64c9502d61fd06bb1859f847a1c3ea5dc681bb7a44e245abfc8a1ce0b527490f97b684a83066378b07ec4464f3388fc0e2a28972f4d

data/bin/dotman

@@ -6,38 +6,44 @@ class Main
     DOTFILE = 'Dotfile'
 
     def self.run(opts)
+        if opts['--version']
+            puts VERSION
+            exit
+        end
+
         unless File.exist?(DOTFILE)
             puts 'Dotfile not found'.red
             exit 1
         end
 
         class << Dotfile
-            load DOTFILE
+            load(DOTFILE)
         end
 
         env = {
             base: opts['--base'],
-            home: opts['--home']
+            home: opts['--home'],
         }
 
         puts Dotfile.to_script(env)
     end
 end
 
-docs = <<~EOF
-    #{'Usage:'.bold}
-        dotman [ --home=PATH ] --base=PATH build
+usage = <<~EOF
+    Usage:
+        dotman [--home PATH] --base PATH build
+        dotman ( --version | --help )
 
-    #{'Options:'.bold}
-        -b, --base=PATH    Directory from where configuration files should be sourced
-        --home=PATH        Directory where symlinks should be placed [default: $HOME]
+    Options:
+        -b, --base PATH    Directory from where configuration files should be sourced
+        --home PATH        Directory where symlinks should be placed [default: $HOME]
         -v, --version      Show version
         -h, --help         Show this help
 EOF
 
 begin
-    Main.run(Docopt::docopt(docs, version: VERSION))
-rescue Docopt::Exit => e
-    puts e.message
-    exit 1
+    Main.run(Docopt.docopt(usage))
+rescue Docopt::Exit
+    puts usage
+    exit 2
 end

data/lib/dotman/actions/init.rb

@@ -20,10 +20,12 @@ module Dotman::Action
 
         def die
             Shell.block([
-                Shell.echo(:red, 'One or more core environment variables is missing; cannot continue.'),
-                Shell.exit(1)
+                Shell.echo(
+                    :red,
+                    'One or more core environment variables is missing; cannot continue.',
+                ),
+                Shell.exit(1),
             ])
         end
-
     end
 end

data/lib/dotman/actions/link.rb

@@ -1,7 +1,8 @@
 module Dotman::Action
     class Link
         def initialize(from, to)
-            @from, @to = from, to
+            @from = from
+            @to = to
         end
 
         def to_statement
@@ -10,7 +11,8 @@ module Dotman::Action
 
         private
 
-        attr_reader :from, :to
+        attr_reader :from
+        attr_reader :to
 
         def pair
             [from, to]
@@ -32,7 +34,7 @@ module Dotman::Action
 
             dirname = File.dirname(pair[1])
             if dirname != '.'
-                block.prepend Shell.command('mkdir --parents $HOME_DIR/%s' % dirname)
+                block.prepend(Shell.command('mkdir --parents $HOME_DIR/%s' % dirname))
             end
 
             Shell.block(block)

data/lib/dotman/checks/host.rb

@@ -1,7 +1,9 @@
 module Dotman::Check
     class Host
         def initialize(aliases, hosts, include: true)
-            @aliases, @hosts, @include = aliases, hosts, include
+            @aliases = aliases
+            @hosts = hosts
+            @include = include
         end
 
         def to_comparison
@@ -11,11 +13,11 @@ module Dotman::Check
         private
 
         def condition_operator
-            if @include then :or else :and end
+            @include ? :or : :and
         end
 
         def comparison_operator
-            if @include then '=' else '!=' end
+            @include ? '=' : '!='
         end
 
         def compare(host)

data/lib/dotman/dotfile_configuration.rb

@@ -1,11 +1,12 @@
 module Dotman
     class DotfileConfiguration
         def initialize
-            @actions, @host_aliases = [], {}
+            @actions = []
+            @host_aliases = {}
         end
 
         def link(from, to: nil, **args)
-            add_action Action::Link.new(from, to), args
+            add_action(Action::Link.new(from, to), args)
         end
 
         def to_script(env)

data/lib/dotman/shell/comparison.rb

@@ -1,14 +1,16 @@
 module Dotman::Shell
     class Comparison
-        def initialize(operand1, operator, operand2 = nil)
-            @operand1, @operator, @operand2 = operand1, operator, operand2
+        def initialize(operand_1, operator, operand_2 = nil)
+            @operand_1 = operand_1
+            @operator = operator
+            @operand_2 = operand_2
         end
 
         def to_s
-            if @operand2.nil?
-                '[ %s "%s" ]' % [@operator, @operand1]
+            if @operand_2.nil?
+                '[ %s "%s" ]' % [@operator, @operand_1]
             else
-                '[ "%s" %s "%s" ]' % [ @operand1, @operator, @operand2 ]
+                '[ "%s" %s "%s" ]' % [@operand_1, @operator, @operand_2]
             end
         end
     end

data/lib/dotman/shell/statement.rb

@@ -26,4 +26,3 @@ module Dotman::Shell
         end
     end
 end
-

data/lib/dotman/version.rb

@@ -1,3 +1,3 @@
 module Dotman
-    VERSION = "2.0.3"
+    VERSION = '2.0.7'
 end

data/lib/dotman.rb

@@ -8,7 +8,7 @@ require 'socket'
 
 module Dotman
     def self.root_dir
-        File.expand_path('../..', __FILE__)
+        File.expand_path('..', __dir__)
     end
 end
 

metadata

@@ -1,71 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: dotman-bin
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.7
 platform: ruby
 authors:
 - crdx
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-20 00:00:00.000000000 Z
+date: 2021-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: require_all
+  name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
-  name: colorize
+  name: docopt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.6.1
 - !ruby/object:Gem::Dependency
-  name: docopt
+  name: require_all
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -81,19 +81,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.8'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: 0.21.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: 0.21.0
 description:
 email:
 executables:
@@ -118,7 +118,8 @@ files:
 homepage: https://github.com/crdx/dotman
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -127,14 +128,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.21
+rubygems_version: 3.2.29
 signing_key:
 specification_version: 4
 summary: Manage dotfiles