rbcli 0.3.1 → 0.3.3

data/lib/rbcli/version.rb

@@ -19,5 +19,5 @@
 ##################################################################################
 
 module Rbcli
-	VERSION = '0.3.1'
+	VERSION = '0.3.3'
 end

data/lib/rbcli-tool/generators.rb

@@ -42,7 +42,7 @@ module RBCliTool
 		end
 
 		def run
-			if File.exists? @dest
+			if File.exist? @dest
 				RBCliTool.continue_confirmation "The command #{@template_vars[:name]} already exists; contents will be overwritten."
 				FileUtils.rm_rf @dest
 			end
@@ -70,7 +70,7 @@ module RBCliTool
 			confirmed = false
 			@filepaths.each do |file|
 				next if file[:dest].end_with? '.sh' and @template_vars[:no_script]
-				if File.exists? file[:dest]
+				if File.exist? file[:dest]
 					RBCliTool.continue_confirmation "The script command #{@template_vars[:name]} already exists; contents will be overwritten." unless confirmed
 					confirmed = true
 					FileUtils.rm_rf file[:dest]
@@ -94,7 +94,7 @@ module RBCliTool
 		end
 
 		def run
-			if File.exists? @dest
+			if File.exist? @dest
 				RBCliTool.continue_confirmation "The #{@typename} hook already exists; contents will be overwritten."
 				FileUtils.rm_rf @dest
 			end

data/lib/rbcli-tool/mdless_fix.rb

@@ -378,7 +378,7 @@ module CLIMarkdown
 									base = File.expand_path(File.dirname(@file))
 									img_path = File.join(base,img_path)
 								end
-								if File.exists?(img_path)
+								if File.exist?(img_path)
 									pre = match[2].size > 0 ? "    #{c([:d,:blue])}[#{match[2].strip}]\n" : ''
 									post = tail.size > 0 ? "\n    #{c([:b,:blue])}-- #{tail} --" : ''
 									img = %x{imgcat "#{img_path}"}

data/lib/rbcli-tool/project.rb

@@ -91,7 +91,7 @@ module RBCliTool
 			RBCliTool.cp_file @micropath, "#{@dest}/#{@template_vars[:cmdname]}", @template_vars
 		end
 
-		def exists?
+		def exist?
 			project_exists?
 		end
 
@@ -99,7 +99,7 @@ module RBCliTool
 			# We look for the .rbcli file in the current tree and return the root path
 			searchpath = path
 			while !searchpath.empty?
-				return searchpath if File.directory? searchpath and File.exists? "#{searchpath}/.rbcli"
+				return searchpath if File.directory? searchpath and File.exist? "#{searchpath}/.rbcli"
 				spath = searchpath.split('/')
 				searchpath = (spath.length == 2) ? '/' : spath[0..-2].join('/')
 			end
@@ -110,7 +110,7 @@ module RBCliTool
 
 		def project_exists?
 			# If the specified file already exists...
-			#return true if File.exists? @dest
+			#return true if File.exist? @dest
 
 			# Or if the .rbcli file exists anywhere in the tree, we know that we are in a subdirectory of a project
 			Project::find_root(@dest)

data/lib/rbcli-tool/util.rb

@@ -28,13 +28,13 @@ module RBCliTool
 		end
 
 		def render
-			ERB.new(File.read(@filename), nil, '-').result(binding)
+			ERB.new(File.read(@filename), trim_mode: '-').result(binding)
 		end
 	end
 
 	def self.cp_file src, dest, template_vars = nil
 		dest = "#{dest}#{src.split('/')[-1]}" if dest.end_with? '/'
-		if File.exists? dest
+		if File.exist? dest
 			puts "File #{dest} already exists. Please delete it and try again."
 			false
 		else
@@ -47,7 +47,7 @@ module RBCliTool
 				FileUtils.cp src, dest
 			end
 
-			FileUtils.rm_f "#{File.dirname(dest)}/.keep" if File.exists? "#{File.dirname(dest)}/.keep"
+			FileUtils.rm_f "#{File.dirname(dest)}/.keep" if File.exist? "#{File.dirname(dest)}/.keep"
 			puts "Done!"
 			true
 		end

data/rbcli.gemspec

@@ -53,19 +53,21 @@ Gem::Specification.new do |spec|
 	spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
 	spec.require_paths = ['lib']
 
-	spec.add_development_dependency 'bundler', '~> 2.2'
-	spec.add_development_dependency 'rake', '~> 13.0'
-	# spec.add_development_dependency 'rspec', '~> 3.8'
-	# spec.add_development_dependency 'minitest', '~> 5.0'
+	spec.add_development_dependency 'bundler', '>= 2'
+	spec.add_development_dependency 'rake', '>= 13'
 
-	spec.add_dependency 'colorize', '~> 0.8'
-	spec.add_dependency 'deep_merge', '~> 1.2'
-	spec.add_dependency 'aws-sdk-dynamodb', '~> 1.64'
-	spec.add_dependency 'macaddr', '~> 1.7'
-	spec.add_dependency 'rufus-scheduler', '~> 3.8'
-	spec.add_dependency 'octokit', '~> 4.21'
-	spec.add_dependency 'mdless', '~> 1.0'
-	spec.add_dependency 'net-ssh', '~> 6.1'
-	spec.add_dependency 'net-scp', '~> 3.0'
-	# spec.add_dependency 'trollop', '~> 2.1'
+	spec.add_dependency 'colorize', '~> 1'
+	spec.add_dependency 'deep_merge', '~> 1'
+	spec.add_dependency 'aws-sdk-dynamodb', '~> 1'
+	spec.add_dependency 'macaddr', '~> 1'
+	spec.add_dependency 'rufus-scheduler', '~> 3'
+	spec.add_dependency 'octokit', RUBY_VERSION >= '3.3.0' ? '~> 8' : '~> 7'
+	spec.add_dependency 'mdless', RUBY_VERSION >= '3.3.0' ? '~> 2' : '~> 1'
+	spec.add_dependency 'net-ssh', '~> 7'
+	spec.add_dependency 'net-scp', '~> 4'
+	#TODO: Pull in the Optimist gem once the required PR's have been merged:
+	# https://github.com/ManageIQ/optimist/pull/145
+	# https://github.com/ManageIQ/optimist/pull/146
+	# https://github.com/ManageIQ/optimist/pull/147
+	# spec.add_dependency 'optimist', '???'
 end

data/skeletons/micro/executable

@@ -7,7 +7,12 @@
 ## It's job is to load and execute the application.
 #########################################################
 
-require (ENV['RBCLI_ENV'] == 'development') ? ENV['RBCLI_DEVPATH'] || 'rbcli' : 'rbcli'
+require 'bundler/inline'
+gemfile do
+	source 'https://rubygems.org'
+	ruby ">= <%= RUBY_VERSION %>"
+	gem 'rbcli', '>= <%= @vars[:rbcli_version] %>', require: true
+end
 
 #########################
 ## Configuration Block ##

data/skeletons/mini/executable

@@ -7,7 +7,12 @@
 ## It's job is to load and execute the application.
 #########################################################
 
-require (ENV['RBCLI_ENV'] == 'development') ? ENV['RBCLI_DEVPATH'] || 'rbcli' : 'rbcli'
+require 'bundler/inline'
+gemfile do
+	source 'https://rubygems.org'
+	ruby ">= <%= RUBY_VERSION %>"
+	gem 'rbcli', '>= <%= @vars[:rbcli_version] %>', require: true
+end
 
 #########################
 ## Configuration Block ##

data/skeletons/project/untitled.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
 	spec.homepage    = "TODO: Put your gem's website or public repo URL here."
 	spec.license     = 'None'
 
-	spec.required_ruby_version = '>= 2.3'
+	spec.required_ruby_version = ">= <%= RUBY_VERSION %>"
 
 	# Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
 	# to allow pushing to a single host or delete this section to allow pushing to any host.
@@ -32,9 +32,9 @@ Gem::Specification.new do |spec|
 	spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
 	spec.require_paths = ['application', 'config', 'default_user_configs', 'hooks', 'lib']
 
-	spec.add_development_dependency 'bundler', '~> 2.2'
-	spec.add_development_dependency 'rake', '~> 13.0'
-	spec.add_development_dependency 'rspec', '~> 3.10'
+	spec.add_development_dependency 'bundler', '~> 2'
+	spec.add_development_dependency 'rake', '~> 13'
+	spec.add_development_dependency 'rspec', '~> 3'
 
 	spec.add_dependency 'rbcli', '>= <%= @vars[:rbcli_version] %>'
 end

metadata

@@ -1,169 +1,169 @@
 --- !ruby/object:Gem::Specification
 name: rbcli
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.3
 platform: ruby
 authors:
 - Andrew Khoury
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-10-20 00:00:00.000000000 Z
+date: 2024-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '13'
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: deep_merge
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: aws-sdk-dynamodb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.64'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.64'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: macaddr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: rufus-scheduler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: octokit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.21'
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.21'
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: mdless
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: net-scp
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4'
 description: RBCli is a framework to quickly develop command-line tools and applications.
 email:
 - akhoury@live.com
@@ -185,6 +185,7 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- docs-src/.hugo_build.lock
 - docs-src/archetypes/default.md
 - docs-src/config.toml
 - docs-src/content/_index.md
@@ -596,8 +597,8 @@ files:
 - lib/rbcli/util/deprecation_warning.rb
 - lib/rbcli/util/hash_deep_symbolize.rb
 - lib/rbcli/util/msg.rb
+- lib/rbcli/util/optimist.rb
 - lib/rbcli/util/string_colorize.rb
-- lib/rbcli/util/trollop.rb
 - lib/rbcli/version.rb
 - rbcli.gemspec
 - skeletons/micro/executable
@@ -649,7 +650,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: A CLI Application/Tooling Framework for Ruby