bashly 0.4.1rc1 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e31810f90eb5199f74dd9fd0dc0aedfb4bfd5dd4f38bc4e36473ab6c3e4f10d2
-  data.tar.gz: 5de458e2eea4ec796e44a67cddeabaf848ef069ec2d37ad7ddb1f3cc660bad27
+  metadata.gz: 7e2d8e44019822a048ede2fadd9da870df078afad2931470748912b25acfb93f
+  data.tar.gz: 84738b8835be3af778b0df351154c2a73c966ee906317f61534c8100a17da9f8
 SHA512:
-  metadata.gz: 72a03554e17b648efda96ac0208bd4ee8223680717933a71907994ca3a3db3ffd629ea3572fc27143babb6634a65ad2f0b83fdeaeea2ab01d0c4755ea630f674
-  data.tar.gz: eb955f344c428e92b82150b95256f3c9d90e3461353bb6b13cad68eeb17bf5e6220991590aa1d797b447ee5c92f414ef9b5042b13569a284595dac0cadd7babd
+  metadata.gz: 653e9a5a685d321837472cb2522f93aeabc0ed0de479f97ca35dcbb1d08e2bd997d50e17653c464ce201388f6b21ac59fa4b9d28a01beed5d5119beb8b278e1b
+  data.tar.gz: 79c111478814fb30246a214511946331c7a581196187c41ef6bc249be3858123786bba3596484b27d493288714fb9d257fc18e7b4432b0f77effe8ed7baa740b

data/lib/bashly/commands/generate.rb

@@ -3,14 +3,18 @@ module Bashly
     class Generate < Base
       help "Generate the bash script and required files"
 
-      usage "bashly generate [--force]"
+      usage "bashly generate [--force --wrap FUNCTION]"
       usage "bashly generate (-h|--help)"
 
       option "-f --force", "Overwrite existing files"
+      option "-w --wrap FUNCTION", "Wrap the entire script in a function so it can also be sourced"
 
       environment "BASHLY_SOURCE_DIR", "The path containing the bashly configuration and source files [default: src]"
       environment "BASHLY_TARGET_DIR", "The path to use for creating the bash script [default: .]"
 
+      example "bashly generate --force"
+      example "bashly generate --wrap my_function"
+
       def run
         create_user_files
         create_master_script
@@ -54,12 +58,15 @@ module Bashly
       end
 
       def create_master_script
-        master_script = command.render('master_script').lint
-        File.write master_script_path, master_script
+        File.write master_script_path, script.code
         FileUtils.chmod "+x", master_script_path
         say "created !txtgrn!#{master_script_path}"
       end
 
+      def script
+        @script ||= Models::Script.new(command, args['--wrap'])
+      end
+
       def master_script_path
         "#{Settings.target_dir}/#{command.name}"
       end

data/lib/bashly/commands/preview.rb

@@ -11,7 +11,8 @@ module Bashly
       def run
         config = Config.new "#{Settings.source_dir}/bashly.yml"
         command = Models::Command.new(config)
-        puts command.render 'master_script'
+        script = Models::Script.new command
+        puts script.code
       end
     end
   end

data/lib/bashly/models/script.rb

@@ -0,0 +1,33 @@
+module Bashly
+  module Models
+    class Script
+      include Renderable
+
+      attr_reader :command, :function_name
+
+      def initialize(command, function_name = nil)
+        @command, @function_name = command, function_name
+      end
+
+      def code
+        if function_name
+          result = [header, render('wrapper')].join "\n"
+        else
+          result = [header, body].join "\n"
+        end
+
+        result.lint
+      end
+
+    private
+
+      def header
+        @header ||= render('header')
+      end
+
+      def body
+        @body ||= command.render('master_script')
+      end
+    end
+  end
+end

data/lib/bashly/version.rb

@@ -1,3 +1,3 @@
 module Bashly
-  VERSION = "0.4.1rc1"
+  VERSION = "0.4.1"
 end

data/lib/bashly/views/command/master_script.erb

@@ -1,7 +1,3 @@
-#!/usr/bin/env bash
-# This script was generated by bashly (https://github.com/DannyBen/bashly)
-# Modifying it manually is not recommended
-
 <%= render :root_command if commands.empty? %>
 <%= render :version_command %>
 <%= render :usage %>

data/lib/bashly/views/script/header.erb

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+# This script was generated by bashly (https://github.com/DannyBen/bashly)
+# Modifying it manually is not recommended

data/lib/bashly/views/script/wrapper.erb

@@ -0,0 +1,6 @@
+# :script.wrapper
+<%= function_name %>() {
+<%= body.indent 2 %>
+}
+
+(return 0 2>/dev/null) || <%= function_name %> "$@"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bashly
 version: !ruby/object:Gem::Version
-  version: 0.4.1rc1
+  version: 0.4.1
 platform: ruby
 authors:
 - Danny Ben Shitrit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-18 00:00:00.000000000 Z
+date: 2021-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colsole
@@ -80,6 +80,7 @@ files:
 - lib/bashly/models/command.rb
 - lib/bashly/models/environment_variable.rb
 - lib/bashly/models/flag.rb
+- lib/bashly/models/script.rb
 - lib/bashly/polyfills/hash.rb
 - lib/bashly/settings.rb
 - lib/bashly/templates/bashly.yml
@@ -123,6 +124,8 @@ files:
 - lib/bashly/views/environment_variable/usage.erb
 - lib/bashly/views/flag/case.erb
 - lib/bashly/views/flag/usage.erb
+- lib/bashly/views/script/header.erb
+- lib/bashly/views/script/wrapper.erb
 homepage: https://github.com/dannyben/bashly
 licenses:
 - MIT
@@ -138,9 +141,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.2.3
 signing_key: