bashly 2.0.0.rc2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65ab4d9e6acb0f638497f14958c9bebc78219cbb1c677d75b5f9f98506301e4c
-  data.tar.gz: fadcbfe0d4dcc48d6081d50f2a76bc57730ebd6e44b7c9a232350e7d072f2d3c
+  metadata.gz: 2b62acae70a34336bc58d4e08f0986c1a0d97e3b389da1afdcf6a055b27b7d25
+  data.tar.gz: 45026b4152f2513db32bcc6faf97df9ae7e64018512177e43857ac333415ed04
 SHA512:
-  metadata.gz: a775101849773351872c8f84ce312ec9d5ebc7a460bfed5858de9edf41d524c319e3dd48c424d3be30379ef79ee3e1d1e4bc4efd4b2b5164f641a3c3e47ee03e
-  data.tar.gz: 58ebb9d697a27856f7383d0ad69a5de4c06b21766347c769f241c1dcd947f2703bb932abf0733624e9a3fc7f475891076136d0038734cbe0b346a90b89d6192c
+  metadata.gz: 21297a4abec515de26a3df6f2e5461d6af45a3c62530f9b497b4562b33a7576e02cff564f9197ec1b6d9b36ba930ad7619b448f9f6d98d56bd2a1dffb4b14367
+  data.tar.gz: 565ae83aa6ddc3971cc6d9fbcab5bebecbafc3ea5013c286c51faa3f977cfa4aacf7adaecaff84130627c8539fa378bb5a59de53b4fc4e97b5171c1a25b26895

data/lib/bashly/commands/add.rb

@@ -29,7 +29,7 @@ module Bashly
         else
           add_lib args['LIBRARY']
         end
-
+      ensure
         lib_source.cleanup if lib_source.git?
       end
 

data/lib/bashly/commands/generate.rb

@@ -107,6 +107,8 @@ module Bashly
           quiet_say "r`warning` not upgrading c`#{existing_file}`, " \
             "unknown library '#{library_name}'"
         end
+      ensure
+        source.cleanup if source&.git?
       end
 
       def upgrade!(existing_file, library)

data/lib/bashly/commands/validate.rb

@@ -1,5 +1,3 @@
-require 'lp'
-
 module Bashly
   module Commands
     class Validate < Base
@@ -13,7 +11,7 @@ module Bashly
 
       def run
         if args['--verbose']
-          lp config
+          puts config.to_yaml
           puts '---'
         end
         validate_config

data/lib/bashly/libraries/render/mandoc/render.rb

@@ -1,5 +1,6 @@
 # render script - mandoc
 require 'gtx'
+require 'shellwords'
 
 # Load the GTX template
 template = "#{source}/mandoc.gtx"
@@ -12,9 +13,12 @@ save_manpage = lambda { |command|
   save mdfile, gtx.parse(command)
 
   # The pandoc command that creates a manpage from markdown
-  cmd = %[pandoc -f markdown-smart -s --to man "#{mdfile}" > "#{manfile}"]
-  success = system cmd
-  raise "Failed running pandoc\nMake sure the following command succeeds and try again:\n\n  #{cmd}" unless success
+  command = ['pandoc', '-f', 'markdown-smart', '-s', '--to', 'man', mdfile, '-o', manfile]
+  success = system(*command)
+  unless success
+    command_string = Shellwords.join command
+    raise "Failed running pandoc\nMake sure the following command succeeds and try again:\n\n  #{command_string}"
+  end
 
   say "g`saved` #{manfile}"
 }
@@ -30,5 +34,5 @@ end
 # Show one of the files if requested
 if show
   file = "#{target}/#{show}"
-  system "man #{file}" if File.exist?(file)
+  system 'man', file if File.exist?(file)
 end

data/lib/bashly/library_source.rb

@@ -1,4 +1,5 @@
 require 'fileutils'
+require 'shellwords'
 require 'tmpdir'
 
 module Bashly
@@ -34,7 +35,8 @@ module Bashly
     end
 
     def cleanup
-      FileUtils.rm_rf(File.join(Dir.tmpdir, 'bashly-libs-*'))
+      FileUtils.rm_rf @tmpdir if @tmpdir
+      @tmpdir = nil
     end
 
   private
@@ -48,11 +50,11 @@ module Bashly
     end
 
     def git_clone
-      dir = Dir.mktmpdir 'bashly-libs-'
-      safe_run "git clone --quiet #{git_specs[:url]} #{dir}"
-      safe_run %[git -C "#{dir}" checkout --quiet #{git_specs[:ref]}] if git_specs[:ref]
+      @tmpdir = Dir.mktmpdir 'bashly-libs-'
+      safe_run 'git', 'clone', '--quiet', git_specs[:url], @tmpdir
+      safe_run 'git', '-C', @tmpdir, 'checkout', '--quiet', git_specs[:ref] if git_specs[:ref]
 
-      "#{dir}#{git_specs[:path]}"
+      "#{@tmpdir}#{git_specs[:path]}"
     end
 
     def git_specs
@@ -70,8 +72,8 @@ module Bashly
       end
     end
 
-    def safe_run(cmd)
-      raise "Failed running command:\nm`#{cmd}`" unless system cmd
+    def safe_run(*command)
+      raise "Failed running command:\nm`#{Shellwords.join command}`" unless system(*command)
     end
 
     def transform_github_uri

data/lib/bashly/version.rb

@@ -1,3 +1,3 @@
 module Bashly
-  VERSION = '2.0.0.rc2'
+  VERSION = '2.0.0'
 end

data/lib/bashly/views/command/parse_requirements_while.gtx

@@ -18,6 +18,16 @@ if catch_all.enabled?
 >       break
 >       ;;
 >
+else
+>     --)
+>       shift
+>       while [[ $# -gt 0 ]]; do
+>         key="$1"
+= render(:parse_requirements_case).indent(8)
+>       done
+>       break
+>       ;;
+>
 end
 
 >     -?*)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bashly
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc2
+  version: 2.0.0
 platform: ruby
 authors:
 - Danny Ben Shitrit
@@ -37,20 +37,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.1
-- !ruby/object:Gem::Dependency
-  name: lp
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: mister_bin
   requirement: !ruby/object:Gem::Requirement
@@ -323,7 +309,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.17
+rubygems_version: 4.0.19
 specification_version: 4
 summary: Bash command-line framework and CLI generator
 test_files: []