update setup to copy library instead of download

bin/setup.dart

@@ -1,33 +1,22 @@
 import 'dart:io';
 
-import 'package:archive/archive.dart';
 import 'package:args/command_runner.dart';
 import 'package:cli_util/cli_logging.dart' show Ansi, Logger;
 import 'package:libgit2dart/src/util.dart';
+import 'package:path/path.dart' as path;
+import 'package:pub_cache/pub_cache.dart';
 
+/// Checks whether libgit2 library is present in directory for [platform].
 bool libgit2IsPresent(String platform) {
   final result = File.fromUri(
-    Directory.current.uri
+    Directory.current.uri.resolve(path.join(libDir, platform, getLibName())),
-        .resolve('.dart_tool/libgit2/$platform/${getLibName()}'),
   ).existsSync();
   return result;
 }
 
-/// Extracts a tar.gz file.
+/// Copies prebuilt libgit2 library from package in '.pub_cache' into correct
-void extract(String fileName, String dir) {
+/// directory for [platform].
-  final tarGzFile = File(fileName).readAsBytesSync();
+Future<void> copyLibrary(String platform) async {
-  final archive = GZipDecoder().decodeBytes(tarGzFile, verify: true);
-  final tarData = TarDecoder().decodeBytes(archive, verify: true);
-  for (final file in tarData) {
-    File('$dir${file.name}')
-      ..createSync(recursive: true)
-      ..writeAsBytesSync(file.content as List<int>);
-  }
-}
-
-/// Downloads libgit2 from GitHub releases, extracts and places it in correct
-/// directory.
-Future<void> download(String platform) async {
   final logger = Logger.standard();
   final ansi = Ansi(Ansi.terminalSupportsAnsi);
 
@@ -37,39 +26,21 @@ Future<void> download(String platform) async {
     } else {
       logger.stdout(
         '${ansi.red}libgit2 for $platform is outdated.\n'
-        'If it is dart application run: \n'
+        'Please run following commands: \n'
         'dart run libgit2dart:setup clean\n'
-        'dart run libgit2dart:setup\n\n'
+        'dart run libgit2dart:setup\n\n',
-        'If it is flutter application run: \n'
-        'flutter pub run libgit2dart:setup clean\n'
-        'flutter pub run libgit2dart:setup\n\n',
       );
     }
   } else {
-    final fileName = '$platform.tar.gz';
+    final pubCache = PubCache();
-    final downloadUrl = '$libUrl$fileName';
+    final pubCacheDir =
-    logger.stdout('Downloading libgit2 for $platform');
+        pubCache.getLatestVersion('libgit2dart')!.resolve()!.location;
-    logger.stdout(downloadUrl);
+    final libUri = pubCacheDir.uri.resolve(path.join(platform, getLibName()));
 
-    try {
+    logger.stdout('Copying libgit2 for $platform');
-      final httpClient = HttpClient();
+    final destination = path.join(libDir, platform);
-      final request = await httpClient.getUrl(Uri.parse(downloadUrl));
+    Directory(destination).createSync(recursive: true);
-      final response = await request.close();
+    File.fromUri(libUri).copySync(destination);
-      final fileSink = File(fileName).openWrite();
-      await response.pipe(fileSink);
-      await fileSink.flush();
-      await fileSink.close();
-      httpClient.close();
-    } catch (error) {
-      Exception("Can't download. Check your internet connection.");
-    }
-
-    logger.stdout('${ansi.yellow}Extracting libgit2 for $platform${ansi.none}');
-    Directory('$libDir$platform/').createSync(recursive: true);
-    extract(fileName, '$libDir$platform/');
-    logger.stdout('${ansi.green}Done! Cleaning up...');
-
-    File(fileName).deleteSync();
 
     logger.stdout(
       '${ansi.green}Done! libgit2 for $platform is now available!'
@@ -80,7 +51,7 @@ Future<void> download(String platform) async {
 
 class CleanCommand extends Command<void> {
   @override
-  String get description => 'Cleans downloaded libraries.';
+  String get description => 'Cleans copied libgit2 libraries.';
 
   @override
   String get name => 'clean';
@@ -88,7 +59,7 @@ class CleanCommand extends Command<void> {
   @override
   void run() {
     final logger = Logger.standard();
-    logger.stdout('cleaning...');
+    logger.stdout('Cleaning...');
     Directory(libDir).deleteSync(recursive: true);
   }
 }
@@ -96,9 +67,9 @@ class CleanCommand extends Command<void> {
 void main(List<String> args) {
   final runner = CommandRunner<void>(
     'setup',
-    'Downloads the libgit2 library.',
+    'Setups the libgit2 library.',
   );
   runner.addCommand(CleanCommand());
 
-  (args.isEmpty) ? download(Platform.operatingSystem) : runner.run(args);
+  (args.isEmpty) ? copyLibrary(Platform.operatingSystem) : runner.run(args);
 }

lib/src/util.dart

@@ -6,12 +6,9 @@ import 'dart:io';
 import 'package:cli_util/cli_logging.dart' show Ansi, Logger;
 import 'package:ffi/ffi.dart';
 import 'package:libgit2dart/src/bindings/libgit2_bindings.dart';
-import 'package:path/path.dart' as p;
+import 'package:path/path.dart' as path;
 import 'package:pub_cache/pub_cache.dart';
 
-const tag = 'libs-v1.3.0';
-const libUrl =
-    'https://github.com/SkinnyMind/libgit2dart/releases/download/$tag/';
 const libgit2Version = '1.3.0';
 const libDir = '.dart_tool/libgit2/';
 
@@ -45,7 +42,7 @@ String? _resolveLibUri(String name) {
 
   // If lib is in Present Working Directory's '.dart_tool/libgit2/[platform]' folder.
   libUri = Directory.current.uri.resolve(
-    p.join(libDir, Platform.operatingSystem, name),
+    path.join(libDir, Platform.operatingSystem, name),
   );
   if (_doesFileExist(libUri)) {
     return libUri.toFilePath(windows: Platform.isWindows);
@@ -53,7 +50,7 @@ String? _resolveLibUri(String name) {
 
   // If lib is in Present Working Directory's '[platform]' folder.
   libUri = Directory.current.uri.resolve(
-    p.join(Platform.operatingSystem, name),
+    path.join(Platform.operatingSystem, name),
   );
   if (_doesFileExist(libUri)) {
     return libUri.toFilePath(windows: Platform.isWindows);
@@ -63,7 +60,7 @@ String? _resolveLibUri(String name) {
   final pubCache = PubCache();
   final pubCacheDir =
       pubCache.getLatestVersion('libgit2dart')!.resolve()!.location;
-  libUri = pubCacheDir.uri.resolve(p.join(Platform.operatingSystem, name));
+  libUri = pubCacheDir.uri.resolve(path.join(Platform.operatingSystem, name));
   if (_doesFileExist(libUri)) {
     return libUri.toFilePath(windows: Platform.isWindows);
   }
@@ -82,21 +79,8 @@ DynamicLibrary loadLibrary(String name) {
     final ansi = Ansi(Ansi.terminalSupportsAnsi);
 
     logger.stderr(
-      '${ansi.red}Failed to open the library. Make sure that required '
+      '${ansi.red}Failed to open the library. Make sure that libgit2 '
-      'library is in place.${ansi.none}',
+      'library is bundled with the application.${ansi.none}',
-    );
-    logger.stdout(
-      'To download the library, please run the following command from the '
-      'root of your project:',
-    );
-    logger.stdout(
-      '${ansi.yellow}dart run libgit2dart:setup${ansi.none} for '
-      'dart application',
-    );
-    logger.stdout(ansi.none);
-    logger.stdout(
-      '${ansi.yellow}flutter pub run libgit2dart:setup${ansi.none} for '
-      'flutter application',
     );
     logger.stdout(ansi.none);
     rethrow;