Move ci_test into root package

phntmxyz · Jun 10, 2024 · 6174461 · 6174461
1 parent ce57cc2
commit 6174461
Show file tree

Hide file tree

Showing 51 changed files with 13 additions and 148 deletions.
diff --git a/puro_sidekick_plugin/.DS_Store → .github/.DS_Store b/puro_sidekick_plugin/.DS_Store → .github/.DS_Store
diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml
@@ -10,4 +10,4 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Install dependencies using the Puro Sidekick Plugin
-        run: cd sidekick_test && ./skt flutter pub get
+        run: cd ci_test && ./skt flutter pub get
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+.DS_Store
 # See https://www.dartlang.org/guides/libraries/private-files
 
 # Files and directories created by pub

diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/puro_sidekick_plugin/CHANGELOG.md → CHANGELOG.md b/puro_sidekick_plugin/CHANGELOG.md → CHANGELOG.md
diff --git a/puro_sidekick_plugin/LICENSE → LICENSE b/puro_sidekick_plugin/LICENSE → LICENSE
diff --git a/puro_sidekick_plugin/analysis_options.yaml → analysis_options.yaml b/puro_sidekick_plugin/analysis_options.yaml → analysis_options.yaml
diff --git a/sidekick_test/.gitignore → ci_test/.gitignore b/sidekick_test/.gitignore → ci_test/.gitignore
diff --git a/sidekick_test/.metadata → ci_test/.metadata b/sidekick_test/.metadata → ci_test/.metadata
diff --git a/sidekick_test/README.md → ci_test/README.md b/sidekick_test/README.md → ci_test/README.md
diff --git a/sidekick_test/analysis_options.yaml → ci_test/analysis_options.yaml b/sidekick_test/analysis_options.yaml → ci_test/analysis_options.yaml
diff --git a/sidekick_test/lib/main.dart → ci_test/lib/main.dart b/sidekick_test/lib/main.dart → ci_test/lib/main.dart
diff --git a/sidekick_test/linux/.gitignore → ci_test/linux/.gitignore b/sidekick_test/linux/.gitignore → ci_test/linux/.gitignore
diff --git a/sidekick_test/linux/CMakeLists.txt → ci_test/linux/CMakeLists.txt b/sidekick_test/linux/CMakeLists.txt → ci_test/linux/CMakeLists.txt
diff --git a/sidekick_test/linux/flutter/CMakeLists.txt → ci_test/linux/flutter/CMakeLists.txt b/sidekick_test/linux/flutter/CMakeLists.txt → ci_test/linux/flutter/CMakeLists.txt
diff --git a/...ux/flutter/generated_plugin_registrant.cc → ...ux/flutter/generated_plugin_registrant.cc b/...ux/flutter/generated_plugin_registrant.cc → ...ux/flutter/generated_plugin_registrant.cc
diff --git a/...nux/flutter/generated_plugin_registrant.h → ...nux/flutter/generated_plugin_registrant.h b/...nux/flutter/generated_plugin_registrant.h → ...nux/flutter/generated_plugin_registrant.h
diff --git a/...est/linux/flutter/generated_plugins.cmake → ...est/linux/flutter/generated_plugins.cmake b/...est/linux/flutter/generated_plugins.cmake → ...est/linux/flutter/generated_plugins.cmake
diff --git a/sidekick_test/linux/main.cc → ci_test/linux/main.cc b/sidekick_test/linux/main.cc → ci_test/linux/main.cc
diff --git a/sidekick_test/linux/my_application.cc → ci_test/linux/my_application.cc b/sidekick_test/linux/my_application.cc → ci_test/linux/my_application.cc
diff --git a/sidekick_test/linux/my_application.h → ci_test/linux/my_application.h b/sidekick_test/linux/my_application.h → ci_test/linux/my_application.h
diff --git a/sidekick_test/pubspec.yaml → ci_test/pubspec.yaml b/sidekick_test/pubspec.yaml → ci_test/pubspec.yaml
diff --git a/sidekick_test/skt → ci_test/skt b/sidekick_test/skt → ci_test/skt
diff --git a/sidekick_test/skt_sidekick/.gitignore → ci_test/skt_sidekick/.gitignore b/sidekick_test/skt_sidekick/.gitignore → ci_test/skt_sidekick/.gitignore
diff --git a/...k_test/skt_sidekick/analysis_options.yaml → ci_test/skt_sidekick/analysis_options.yaml b/...k_test/skt_sidekick/analysis_options.yaml → ci_test/skt_sidekick/analysis_options.yaml
diff --git a/sidekick_test/skt_sidekick/bin/main.dart → ci_test/skt_sidekick/bin/main.dart b/sidekick_test/skt_sidekick/bin/main.dart → ci_test/skt_sidekick/bin/main.dart
diff --git a/...k_test/skt_sidekick/lib/skt_sidekick.dart → ci_test/skt_sidekick/lib/skt_sidekick.dart b/...k_test/skt_sidekick/lib/skt_sidekick.dart → ci_test/skt_sidekick/lib/skt_sidekick.dart
@@ -10,8 +10,6 @@ Future<void> runSkt(List<String> args) async {
     flutterSdkPath: flutterSdkSymlink(),
   );
   addFlutterSdkInitializer(initializePuro);
-  print(Directory.current);
-  print(entryWorkingDirectory.absolute);
 
   runner
     ..addCommand(FlutterCommand())

diff --git a/...ekick/lib/src/commands/clean_command.dart → ...ekick/lib/src/commands/clean_command.dart b/...ekick/lib/src/commands/clean_command.dart → ...ekick/lib/src/commands/clean_command.dart
diff --git a/sidekick_test/skt_sidekick/pubspec.lock → ci_test/skt_sidekick/pubspec.lock b/sidekick_test/skt_sidekick/pubspec.lock → ci_test/skt_sidekick/pubspec.lock
@@ -452,7 +452,7 @@ packages:
   puro_sidekick_plugin:
     dependency: "direct main"
     description:
-      path: "../../puro_sidekick_plugin"
+      path: "../.."
       relative: true
     source: path
     version: "0.1.0"

diff --git a/sidekick_test/skt_sidekick/pubspec.yaml → ci_test/skt_sidekick/pubspec.yaml b/sidekick_test/skt_sidekick/pubspec.yaml → ci_test/skt_sidekick/pubspec.yaml
@@ -19,7 +19,7 @@ dev_dependencies:
 
 dependency_overrides:
   puro_sidekick_plugin:
-    path: ../../puro_sidekick_plugin
+    path: ../../
 
 # generated code, do not edit this manually
 sidekick:

diff --git a/...k_test/skt_sidekick/tool/download_dart.sh → ci_test/skt_sidekick/tool/download_dart.sh b/...k_test/skt_sidekick/tool/download_dart.sh → ci_test/skt_sidekick/tool/download_dart.sh
diff --git a/sidekick_test/skt_sidekick/tool/install.sh → ci_test/skt_sidekick/tool/install.sh b/sidekick_test/skt_sidekick/tool/install.sh → ci_test/skt_sidekick/tool/install.sh
diff --git a/sidekick_test/skt_sidekick/tool/run.sh → ci_test/skt_sidekick/tool/run.sh b/sidekick_test/skt_sidekick/tool/run.sh → ci_test/skt_sidekick/tool/run.sh
diff --git a/...test/skt_sidekick/tool/sidekick_config.sh → ci_test/skt_sidekick/tool/sidekick_config.sh b/...test/skt_sidekick/tool/sidekick_config.sh → ci_test/skt_sidekick/tool/sidekick_config.sh
diff --git a/...kick_plugin/lib/puro_sidekick_plugin.dart → lib/puro_sidekick_plugin.dart b/...kick_plugin/lib/puro_sidekick_plugin.dart → lib/puro_sidekick_plugin.dart
diff --git a/...plugin/lib/src/commands/puro_command.dart → lib/src/commands/puro_command.dart b/...plugin/lib/src/commands/puro_command.dart → lib/src/commands/puro_command.dart
diff --git a/..._sidekick_plugin/lib/src/flutter_sdk.dart → lib/src/flutter_sdk.dart b/..._sidekick_plugin/lib/src/flutter_sdk.dart → lib/src/flutter_sdk.dart
diff --git a/...sidekick_plugin/lib/src/install_puro.dart → lib/src/install_puro.dart b/...sidekick_plugin/lib/src/install_puro.dart → lib/src/install_puro.dart
@@ -14,8 +14,6 @@ Directory installPuro({
 }) {
   final puroPath = getPuroPath();
 
-  print('puro path: $puroPath');
-
   if (puroPath != null) {
     print('Puro is already installed at $puroPath');
     return puroPath.parent.parent;

diff --git a/puro_sidekick_plugin/lib/src/puro.dart → lib/src/puro.dart b/puro_sidekick_plugin/lib/src/puro.dart → lib/src/puro.dart
@@ -38,14 +38,14 @@ int puro(
 
 File? getPuroPath() {
   String? path;
-  final result = dcli.find('puro', workingDirectory: getPuroBinPath().path, recursive: false);
-  path = result.firstLine;
+  // Try to find puro in PATH
+  final which = dcli.which('puro');
+  if (which.found) {
+    path = which.path;
+  }
   if (path == null) {
-    // Try to find puro in PATH
-    final which = dcli.which('puro');
-    if (which.found) {
-      path = which.path;
-    }
+    final result = dcli.find('puro', workingDirectory: getPuroBinPath().path, recursive: false);
+    path = result.firstLine;
   }
   return path != null ? File(path) : null;
 }

diff --git a/...dekick_plugin/lib/src/version_parser.dart → lib/src/version_parser.dart b/...dekick_plugin/lib/src/version_parser.dart → lib/src/version_parser.dart
diff --git a/puro_sidekick_plugin/pubspec.yaml → pubspec.yaml b/puro_sidekick_plugin/pubspec.yaml → pubspec.yaml
diff --git a/puro_sidekick_plugin/.gitignore b/puro_sidekick_plugin/.gitignore
diff --git a/puro_sidekick_plugin/README.md b/puro_sidekick_plugin/README.md
diff --git a/sidekick_test/pubspec.lock b/sidekick_test/pubspec.lock
diff --git a/...plugin/test/set_named_parameter_test.dart → test/set_named_parameter_test.dart b/...plugin/test/set_named_parameter_test.dart → test/set_named_parameter_test.dart
diff --git a/...kick_plugin/test/version_parser_test.dart → test/version_parser_test.dart b/...kick_plugin/test/version_parser_test.dart → test/version_parser_test.dart
diff --git a/puro_sidekick_plugin/tool/install.dart → tool/install.dart b/puro_sidekick_plugin/tool/install.dart → tool/install.dart
diff --git a/..._plugin/tool/src/main_file_modifiers.dart → tool/src/main_file_modifiers.dart b/..._plugin/tool/src/main_file_modifiers.dart → tool/src/main_file_modifiers.dart
diff --git a/...ugin/tool/src/modifiable_source_file.dart → tool/src/modifiable_source_file.dart b/...ugin/tool/src/modifiable_source_file.dart → tool/src/modifiable_source_file.dart
diff --git a/.../tool/src/require_dependency_version.dart → tool/src/require_dependency_version.dart b/.../tool/src/require_dependency_version.dart → tool/src/require_dependency_version.dart