spawnpoint 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ae1f2aae6f8340c03f309364e62b1b78113eff6aab8fcd6ba61ba416cf028b7
-  data.tar.gz: caa9708a4ff55754b5643f107a0bf09fb64b2e736da36986bc23c0babc46da89
+  metadata.gz: 74b63ddf3131da47ad830cf6f2a948e8d874420297465d3815406d0a7a8132d0
+  data.tar.gz: 75501b0a8498aa3ee93decaa33bd03605a598f9b1821eb8fa15ce0c1d0b9d38d
 SHA512:
-  metadata.gz: bc35e776bfca6667e159e4d8b7a5d6f78378b26a0d4d8ffcd0ad0cae32cef918ae168ec247a39301606767d8df496ca3923c5cc9b5fac9ca28b5aebcbb7974e5
-  data.tar.gz: aaf1371dea70274993ab2b3b10efdd2c777b05c6ae005cb703b2681e8d0f0d894a0048b34a167e8d2a40ccef9d4df004514fc374c52a5bb7de2c02f464d23228
+  metadata.gz: 4f895198fc61bc83bb47b86572ba5113b87cf018ecd73194f2406eb3e665703d4390a35a1cadf4b0fcb4b6bcadd32f0df9244994f09303cc94381cb7690c0d59
+  data.tar.gz: 95db91cebc3dacd2ee8766115dcd7121edcd7f4671d532fdfd7037326de84f22ee1722ccd7cbe7a592b47ab5c07c5ec2b407309bd2c7c76280ce62514d5b84ec

data/README.md

@@ -94,7 +94,7 @@ is ready, they can use the Git command directly instead.
 | `spwn hop -- <branch> <file>` | `git restore --source <branch> -- <file>` | Bring a file back from another snapshot. |
 | `spwn upload` | `git push` | Send your snapshots to the shared project space. |
 | `spwn download` | `git pull` | Fetch new snapshots from the shared project space and combine them with yours. |
-| `spwn sync <lesson> --into <game>` | — | Copy lesson files into a game folder, replacing matching files when confirmed. |
+| `spwn sync --target <game> --source <lesson>` | — | Copy lesson files into a game folder, replacing matching files when confirmed. |
 | `spwn rollback --into <game>` | — | Undo the most recent lesson sync: restore replaced files and remove newly copied files. |
 
 A few notes about the mapping:
@@ -123,8 +123,8 @@ students need while following a single-player course:
 - `spwn upload` — push to a remote.
 - `spwn download` — fetch and integrate from a remote.
 - `spwn init` — start a new project.
-- `spwn sync <lesson> --into <game>` — copy lesson files into a game folder. Use `--force` to
-  replace matching files without asking.
+- `spwn sync --target <game> --source <lesson>` — copy lesson files into a game folder. Use `--force` to
+  replace matching files without asking. The older form `spwn sync <lesson> --into <game>` still works.
 - `spwn rollback --into <game>` — undo the most recent sync. Files that existed before the sync
   are restored, files created by the sync are removed, and unrelated game files are left alone.
 

data/lib/spawnpoint/cli.rb

@@ -233,7 +233,7 @@ module Spawnpoint
       sync: {
         name: "sync",
         help: "Copy a lesson folder into your game folder. The first time a lesson touches a file that already exists in your game folder, spwn asks before replacing it. After you accept a file, later lessons upgrade that same file automatically, so asset updates get easier as you go.",
-        usage: "spwn sync <lesson-folder> --into <game-folder>   or   spwn sync <lesson-folder> --into <game-folder> --force",
+        usage: "spwn sync --target <game-folder> --source <lesson-folder> [--force]   or   spwn sync <lesson-folder> --into <game-folder> [--force]",
         handler: ->(args) { require_relative "synchronizer"; Spawnpoint::Synchronizer.new.run(args) }
       },
 

data/lib/spawnpoint/synchronizer.rb

@@ -30,11 +30,12 @@ module Spawnpoint
 
       unless lesson_folder
         puts "Usage:"
+        puts "  spwn sync --target <game-folder> --source <lesson-folder>"
         puts "  spwn sync <lesson-folder> --into <game-folder>"
-        puts "  spwn sync <lesson-folder> --into <game-folder> --force"
+        puts "  add --force to replace existing files without asking"
         puts ""
         puts "Example:"
-        puts "  spwn sync 04-collectibles/starter --into ~/DragonRuby/mygame"
+        puts "  spwn sync --target ~/DragonRuby/mygame --source 04-collectibles/starter"
         puts ""
         puts "The first time a lesson copies a file that already exists in your"
         puts "game folder, spwn asks before replacing it. After you accept a"
@@ -43,8 +44,8 @@ module Spawnpoint
       end
 
       unless into_folder
-        puts "Oops: tell spwn where to copy the lesson with --into."
-        puts "Example: spwn sync 04-collectibles/starter --into ~/DragonRuby/mygame"
+        puts "Oops: tell spwn where to copy the lesson with --target (or --into)."
+        puts "Example: spwn sync --target ~/DragonRuby/mygame --source 04-collectibles/starter"
         return 1
       end
 
@@ -195,9 +196,12 @@ module Spawnpoint
       while i < argv.length
         arg = argv[i]
         case arg
-        when "--into"
+        when "--into", "--target"
           i += 1
           into_folder = argv[i]
+        when "--source"
+          i += 1
+          lesson_folder ||= argv[i]
         when "--force", "-f"
           force = true
         when /\A-/

data/lib/spawnpoint/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Spawnpoint
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/test/test_cli.rb

@@ -17,7 +17,7 @@ class TestCli < Minitest::Test
 
   def test_version_flag_exits_zero
     out, = capture_io { Spawnpoint::CLI.run(["--version"]) }
-    assert_includes out, "0.2.0"
+    assert_includes out, "0.3.0"
   end
 
   def test_unknown_command_exits_one

data/test/test_synchronizer.rb

@@ -52,6 +52,21 @@ class TestSynchronizer < Minitest::Test
     assert_includes marker_paths, "main.rb"
   end
 
+  def test_accepts_target_and_source_flags
+    write(@lesson, "main.rb", "puts :hi")
+    capture_io { @status = Spawnpoint::Synchronizer.new.run(["--target", @game, "--source", @lesson]) }
+    assert_equal 0, @status
+    assert_equal "puts :hi", File.read(File.join(@game, "main.rb"))
+    assert_includes marker_paths, "main.rb"
+  end
+
+  def test_accepts_target_flag_with_positional_lesson
+    write(@lesson, "main.rb", "puts :hi")
+    capture_io { @status = Spawnpoint::Synchronizer.new.run([@lesson, "--target", @game]) }
+    assert_equal 0, @status
+    assert_equal "puts :hi", File.read(File.join(@game, "main.rb"))
+  end
+
   def test_force_replaces_existing_file
     write(@game, "main.rb", "old")
     write(@lesson, "main.rb", "new")

data/test/test_version.rb

@@ -7,6 +7,6 @@ class TestVersion < Minitest::Test
   end
 
   def test_version_is_0_2_0
-    assert_equal "0.2.0", Spawnpoint::VERSION
+    assert_equal "0.3.0", Spawnpoint::VERSION
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spawnpoint
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - bebekim