cl-magic 0.3.1 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80e53f5ff775b7ea5408b5d2e897ff5b5aa660c3e4bac1fcb2665299b8720d58
-  data.tar.gz: 3548fc6ff4d1521bf7ce556e7308cc3c91a75ec79e0617c913ead953fc10348f
+  metadata.gz: '0999ba01e614cf06ee6743675a486597876ee648b5c8e659f0afb468918703bd'
+  data.tar.gz: e5ad4f67f7fe2f4ab75cdb31dbfb54dee39101482bf9fe482b67c3fc2fb3f14f
 SHA512:
-  metadata.gz: 74e1d78d0a26c2cfab9c2ada3bb4ae2785494697845460beada56310f1759c0c1d3aaf4834956c030b9c7c15a13edd6a8100f99285bae4bd9699729e2973e848
-  data.tar.gz: e7c3f76abb93e22048895e7b451c835c8048a6548a929db52c6c2ab7b9b10f6fddabe41f9641d9b09a7a39642a4e1f4461dab33f7f2352e68e9ef4b6d8a420ce
+  metadata.gz: 8c0d00d9e476d43a2178edb581965879cac36fb0cc70037850613371ebe639f0e2badffcd63b86986246f0348ed13458be29522304f5f81d65e22c54c4c0a113
+  data.tar.gz: 9a89994bc628eaf9fe5de592d989cc581bf0dfcbd645d5ab135d495a2c5cc47adcd30e8a32a0142a1367aaf765f55f202fb1545e29db313bd4439a29e2d54f5f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cl-magic (0.3.1)
+    cl-magic (0.3.3)
       optparse-subcommand
       pastel
       tty-command

data/lib/cl/magic/cl-dk

@@ -151,16 +151,11 @@ def print_set_world_help()
   puts ""
 end
 
-def print_save_parts_help(dk_parts_hash)
+def print_set_parts_help()
   puts ""
-  puts "Usage: dk [DK_PARTS] save-parts"
+  puts "Usage: dk [DK_PARTS] set-parts"
   puts ""
-  puts "Save parts in project and apply every time"
-  puts ""
-  puts "Parts:"
-  dk_parts_hash.keys.each do |key|
-    print_dk_help_line(key, dk_parts_hash[key].fetch('help'))
-  end
+  puts "Set parts for a project and apply to every 'dk' command"
   puts ""
 end
 
@@ -327,7 +322,11 @@ def run_dk_set_world()
     print_set_world_help
     exit
   else
-    world_path = File.expand_path(File.join(@working_dir, world_path))
+    if world_path.start_with?("/") or world_path.start_with?("~")
+      world_path = File.expand_path(world_path)
+    else
+      world_path = File.expand_path(File.join(@working_dir, world_path))
+    end
   end
 
   if TTY::Prompt.new.yes?("Set world to: #{world_path}?")
@@ -360,23 +359,25 @@ def run_dk_set_context()
 end
 
 #
-# Run: SAVE PARTS
+# Run: SET PARTS
 #
 
-def run_dk_save_parts(compose_args, dk_parts_hash, selected_part_keys)
+def run_dk_set_parts()
+  parts = ARGV[1..]
   filepath = get_save_parts_filepath()
-  if selected_part_keys.any?
+  if parts.any?
     tempfile = File.new(filepath, 'w')
-    tempfile.write(selected_part_keys.to_yaml) # write it to the tempfile
+    tempfile.write(ARGV[1..].to_yaml) # write it to the tempfile
     tempfile.close
   else
     if File.exist?(filepath)
       File.delete(filepath)
       @logger.info "parts cleared"
     else
-      print_save_parts_help(dk_parts_hash)
+      print_set_parts_help()
     end
   end
+  exit
 end
 
 #
@@ -458,37 +459,38 @@ end
 
 @working_dir = ENV['CL_WORKING_DIR'] # passed through cl-magic to here
 
-# sub-command
+# SET commands first
 case ARGV.first
 when "set-world"
   run_dk_set_world()
 when "set-context"
   run_dk_set_context()
-end
-
-# get compose settings
-compose_hash = get_base_compose_hash()
-if compose_hash
-
-  # world
-  compose_hash = merge_world_files(compose_hash, show_help=ARGV.include?("--help"))
-
-  # x-dk fragments
-  dk_parts_hash = compose_hash['x-dk-parts'] ? compose_hash.delete('x-dk-parts') : {}
-  dk_make_hash = compose_hash['x-dk-make'] ? compose_hash.delete('x-dk-make') : {}
-
-  # parts
-  saved_part_keys = get_saved_parts(dk_parts_hash)
-  compose_args, selected_part_keys = merge_parts_save_and_prep_args(compose_hash, dk_parts_hash, dk_make_hash, saved_part_keys)
-
-  # sub-command
-  case compose_args[2]
-  when "make"
-    all_part_keys = selected_part_keys + saved_part_keys
-    run_dk_make(compose_args, dk_make_hash, dk_parts_hash, all_part_keys)
-  when "save-parts"
-    run_dk_save_parts(compose_args, dk_parts_hash, selected_part_keys)
-  else
-    run_dk(compose_args)
+when "set-parts"
+  run_dk_set_parts()
+else
+
+  # get compose settings
+  compose_hash = get_base_compose_hash()
+  if compose_hash
+
+    # world
+    compose_hash = merge_world_files(compose_hash, show_help=ARGV.include?("--help"))
+
+    # x-dk fragments
+    dk_parts_hash = compose_hash['x-dk-parts'] ? compose_hash.delete('x-dk-parts') : {}
+    dk_make_hash = compose_hash['x-dk-make'] ? compose_hash.delete('x-dk-make') : {}
+
+    # parts
+    saved_part_keys = get_saved_parts(dk_parts_hash)
+    compose_args, selected_part_keys = merge_parts_save_and_prep_args(compose_hash, dk_parts_hash, dk_make_hash, saved_part_keys)
+
+    # sub-command
+    case compose_args[2]
+    when "make"
+      all_part_keys = selected_part_keys + saved_part_keys
+      run_dk_make(compose_args, dk_make_hash, dk_parts_hash, all_part_keys)
+    else
+      run_dk(compose_args)
+    end
   end
 end

data/lib/cl/magic/version.rb

@@ -2,6 +2,6 @@
 
 module Cl
   module Magic
-    VERSION = "0.3.1"
+    VERSION = "0.3.3"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cl-magic
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.3
 platform: ruby
 authors:
 - Don Najd