jlauncher 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f5d6f1b0fc056dde808d74d238cdbf91ca0f335341d884b2cad35f0925747a6
-  data.tar.gz: 5e221c1acf04898b192dbb5b94b92ee30e59913d1a273c5c95bdf702b66d6bde
+  metadata.gz: 3e2c517f35ed329bfd9c4914ce46c9cb73b9acf41997f20bba71a6ad38c1919b
+  data.tar.gz: 9a07409710858691cb51d53d4d3559f2682a7576bbf98000159dc0f9d8e6d3cc
 SHA512:
-  metadata.gz: 160b96d74861c7cda6dbc325d0961157b413e51377659f529c7f677d7ec81f2873014f52f9d71d04f2925a95f62f880c86ae3a3872e2426009bb3a186dba92a5
-  data.tar.gz: 43ecb79b1872658b6f0201de4132085ec7c244fe4aa8f44220b4d35784fd78b5ba789f861851de41baec6e2000488eadd65f8540f35906d55612800eaa284d0b
+  metadata.gz: fba8f573953cbe2f396408f4de14d92d477420d35a51e9ba88f6c024f3d2b4c4ad3c8cfe883b65660f04c6854f02261455a4e779219682352eb43c0f6f1e3d9f
+  data.tar.gz: 800674218c910be02e8410e6d3ac24169b23652b91762a1d32dc7541ed1413c789dadfb5f6ea034f528b3dfc4678f8cf70f2e337b66e36e1420e250aff78727d

data/lib/jlauncher.rb

@@ -10,40 +10,37 @@ require 'colorize'
 module JLauncher
 
   def JLauncher.do_it(argv)
-    parser = Optimist::Parser.new
-    parser.stop_on_unknown
-    parser.stop_on %w(run install)
-    parser.version VERSION
-    parser.banner <<-EOS
+   parser = Optimist::Parser.new
+   parser.stop_on_unknown
+   parser.stop_on %w(run install)
+   parser.version VERSION
+   parser.banner <<-EOS
 Starts a jar with a j-manifest.json description fetching (and caching) all dependencies.
 
 Usage:
 .. j [options] <run|install> <jarfile|manifestfile|mavencoordinates> args...
 where [options] are:
     EOS
-    parser.opt :verbose, "Print debugging info to stderr"
+   parser.opt :verbose, "Print debugging info to stderr"
 
     begin
-      opts = parser.parse(argv)
+      opts =parser.parse(argv)
     rescue Optimist::CommandlineError => e
-      parser.die(e.message, nil, e.error_code)
+     parser.die(e.message, nil, e.error_code)
     rescue Optimist::HelpNeeded
-      parser.educate
+     parser.educate
       exit
     rescue Optimist::VersionNeeded
-      puts parser.version
+      putsparser.version
       exit
     end
 
     verbose = opts[:verbose]
 
-    remaining_args = parser.leftovers
+    remaining_args =parser.leftovers
 
     subcommand = remaining_args.shift
 
-    start_coordinates = remaining_args.shift
-
-    program_args = remaining_args[0..-1]
 
     resolver = Resolver.new(
         MavenRepo.new(File.join(Dir.home, ".m2", "repository")),
@@ -52,64 +49,60 @@ where [options] are:
         verbose
     )
 
-    full_config = if File.exist?(start_coordinates)
-                    if (start_coordinates.end_with?(".jar"))
-                      STDERR.puts("Starting local jar") if verbose
 
-                      start_coordinates = File.expand_path(start_coordinates)
 
-                      extra_class_path = "file:" + File.expand_path(start_coordinates)
+    if subcommand == "run"
+      start_coordinates = remaining_args.shift
 
+      full_config = resolve_full_config(resolver, start_coordinates, verbose)
 
-                      manifest = read_manifest(start_coordinates)
-                      FullConfig.new(manifest, extra_class_path)
-                    else
-                      STDERR.puts("Starting local manifest") if verbose
+      program_args = remaining_args[0..-1]
 
-                      manifest = Manifest.new(JSON.parse(File.read(start_coordinates)))
+      launch_config = full_config.launch_config(resolver)
 
-                      extra_class_path = NIL
-                      FullConfig.new(manifest, extra_class_path)
-                    end
-                  else
-                    STDERR.puts("Starting from repo jar") if verbose
+      launch_config.run(program_args)
+    else
+      if subcommand == "install"
+        subcommand_parser = Optimist::Parser.new
+        subcommand_parser.opt :executable_name, "Name of the executable script.", :type => :string
 
-                    components = start_coordinates.split(":")
-                    if components.length != 3
-                      raise "'#{start_coordinates}' is not a valid coordinate use <groupId>:<artifactId>:<version>"
-                    end
+        begin
+          opts = subcommand_parser.parse(remaining_args)
+        rescue Optimist::HelpNeeded
+          subcommand_parser.educate
+          exit
+        end
 
-                    main_jar = resolver.get(Coordinates.new(start_coordinates))
+        start_coordinates = subcommand_parser.leftovers.first
 
-                    manifest = read_manifest(main_jar)
-                    extra_class_path = "maven:" + start_coordinates
-                    FullConfig.new(manifest, extra_class_path)
-                  end
+        full_config = resolve_full_config(resolver, start_coordinates, verbose)
 
-    if subcommand == "run"
-      launch_config = full_config.launch_config(resolver)
+        executable_name = full_config.manifest.executable_name || opts[:executable_name]
+
+        if ! executable_name
+          raise "Manifest does not contain executable name, please specify one on the commandline like so:\n" +
+                "jlauncher install --executable-name myexecutablename #{full_config.start_coordinates}"
+        end
 
-      launch_config.run(program_args)
-    else
-      if subcommand == "install"
         bin_dir = File.expand_path("~/.config/jlauncher/bin")
-        executable_path = bin_dir + "/" + (manifest.executable_name || "testme")
+
+        executable_path = bin_dir + "/" + (executable_name)
         FileUtils.mkdir_p(bin_dir)
         File.write(executable_path, <<~HEREDOC
-        #!/usr/bin/env bash        
-        
-        set -e
-        set -u
-        set -o pipefail
+          #!/usr/bin/env bash        
+
+          set -e
+          set -u
+          set -o pipefail
 
-        jlauncher run #{start_coordinates} "$@"
+          jlauncher run #{full_config.start_coordinates} "$@"
         HEREDOC
         )
 
         File.chmod(0755, executable_path)
         check_path(bin_dir)
 
-        STDERR.puts("'#{start_coordinates}' has been installed as #{manifest.executable_name.bold}.")
+        STDERR.puts("'#{full_config.start_coordinates}' has been installed as #{executable_name.bold}.")
       else
         raise "'#{subcommand}' is not a valid subcommand."
       end
@@ -151,12 +144,16 @@ where [options] are:
   # plus an optional extra_class_path element, which contains either
   # maven coordinates or a local file containing a jar
   class FullConfig
-    def initialize(manifest, extra_class_path)
+    attr_reader :manifest, :start_coordinates
+
+    def initialize(manifest, extra_class_path, start_coordinates)
       @manifest = manifest
       @extra_class_path = extra_class_path
+      @start_coordinates = start_coordinates
 
     end
 
+
     def launch_config(resolver)
       class_path_from_manifest = @manifest.dependencies.map {
           |c| resolver.get(c)
@@ -201,4 +198,43 @@ where [options] are:
       @json_map['executableName']
     end
   end
+
+  private
+
+  def self.resolve_full_config(resolver, start_coordinates, verbose)
+    full_config = if File.exist?(start_coordinates)
+                    if (start_coordinates.end_with?(".jar"))
+                      STDERR.puts("Starting local jar") if verbose
+
+                      start_coordinates = File.expand_path(start_coordinates)
+
+                      extra_class_path = "file:" + File.expand_path(start_coordinates)
+
+
+                      manifest = read_manifest(start_coordinates)
+                      FullConfig.new(manifest, extra_class_path, start_coordinates)
+                    else
+                      STDERR.puts("Starting local manifest") if verbose
+
+                      manifest = Manifest.new(JSON.parse(File.read(start_coordinates)))
+
+                      extra_class_path = nil
+                      FullConfig.new(manifest, extra_class_path, start_coordinates)
+                    end
+                  else
+                    STDERR.puts("Starting from repo jar") if verbose
+
+                    components = start_coordinates.split(":")
+                    if components.length != 3
+                      raise "'#{start_coordinates}' is not a valid coordinate use <groupId>:<artifactId>:<version>"
+                    end
+
+                    main_jar = resolver.get(Coordinates.new(start_coordinates))
+
+                    manifest = read_manifest(main_jar)
+                    extra_class_path = "maven:" + start_coordinates
+                    FullConfig.new(manifest, extra_class_path, start_coordinates)
+                  end
+    full_config
+  end
 end

data/lib/jlauncher/version.rb

@@ -1,3 +1,3 @@
 module JLauncher
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jlauncher
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Felix Leipold
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-09-25 00:00:00.000000000 Z
+date: 2020-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler