Print state as output of install and switch command

hidakatsuya · Aug 13, 2024 · ffa8f76 · ffa8f76
1 parent ae8534f
commit ffa8f76
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 23 deletions.
diff --git a/lib/rex/commands/install.rb b/lib/rex/commands/install.rb
@@ -20,6 +20,7 @@ def install_initially(definition)
         install(definition.themes, definition.plugins)
 
         create_lock_file(definition.env)
+        print_state
       end
 
       def apply_diff(lock_definition, definition)
@@ -30,6 +31,7 @@ def apply_diff(lock_definition, definition)
         update(diff.changed_themes, diff.changed_plugins)
 
         create_lock_file(definition.env)
+        print_state
       end
 
       def load_definition(env)
@@ -75,6 +77,10 @@ def update(themes, plugins)
       def create_lock_file(env)
         Definition::Lock.create_file(env)
       end
+
+      def print_state
+        State.new.call
+      end
     end
   end
 end
diff --git a/test/integration/integration_test.rb b/test/integration/integration_test.rb
@@ -27,7 +27,16 @@ class IntegrationTest < Test::Unit::TestCase
 
     docker_exec("rex install").then do |result|
       assert_true result.success?
-      assert_equal "", result.output_str
+      assert_equal [
+        "Rex: 0.1.0",
+        "Env: default",
+        "",
+        "Themes:",
+        " * theme_a (master)",
+        "",
+        "Plugins:",
+        " * plugin_a (master)"
+      ], result.output
     end
 
     docker_exec("ls plugins").then do |result|
@@ -42,19 +51,6 @@ class IntegrationTest < Test::Unit::TestCase
       assert_equal "hellos", result.output_str
     end
 
-    docker_exec("rex state").then do |result|
-      assert_equal [
-        "Rex: 0.1.0",
-        "Env: default",
-        "",
-        "Themes:",
-        " * theme_a (master)",
-        "",
-        "Plugins:",
-        " * plugin_a (master)"
-      ], result.output
-    end
-
     docker_exec("rex uninstall").then do |result|
       assert_true result.success?
       assert_equal "", result.output_str
@@ -75,17 +71,12 @@ class IntegrationTest < Test::Unit::TestCase
 
   test "rex switch" do
     docker_exec("rex switch").then do |result|
-      puts result
       assert_true result.success?
       assert_equal "No lock file found", result.output_str
     end
 
     docker_exec("rex install env1").then do |result|
       assert_true result.success?
-      assert_equal "", result.output_str
-    end
-
-    docker_exec("rex state").then do |result|
       assert_equal [
         "Rex: 0.1.0",
         "Env: env1",
@@ -97,10 +88,6 @@ class IntegrationTest < Test::Unit::TestCase
 
     docker_exec("rex switch env2").then do |result|
       assert_true result.success?
-      assert_equal "", result.output_str
-    end
-
-    docker_exec("rex state").then do |result|
       assert_equal [
         "Rex: 0.1.0",
         "Env: env2",