Merge pull request #14 from Pandademic/add-commmand-testing

Backend change to install with separate command

.github/workflows/2.6ci.yml

@@ -11,6 +11,6 @@ jobs:
         #bundler-cache: true # runs 'bundle install' and caches installed gems automatically
     - run: bundle lock --add-platform x86_64-linux
     - run: bundle install
-    #- run: ruby core/latte.rb help
     - run: ruby core/latte.rb installImg 'https://s3.amazonaws.com/cdn-origin-etr.akc.org/wp-content/uploads/2017/11/22130127/Pug-puppy-standing-in-profile-on-a-white-background.jpg'
     - run: ruby core/latte.rb install brew-source
+    - run: ruby core/latte.rb install brew

.github/workflows/2.7.yml

@@ -15,4 +15,5 @@ jobs:
     #- run: ruby core/latte.rb help
     - run: ruby core/latte.rb installImg 'https://s3.amazonaws.com/cdn-origin-etr.akc.org/wp-content/uploads/2017/11/22130127/Pug-puppy-standing-in-profile-on-a-white-background.jpg'
     - run: ruby core/latte.rb install brew-source
+    - run: ruby core/latte.rb install brew
 

.github/workflows/3.0ci.yml

@@ -15,5 +15,6 @@ jobs:
     #- run: ruby core/latte.rb help
     - run: ruby core/latte.rb installImg 'https://s3.amazonaws.com/cdn-origin-etr.akc.org/wp-content/uploads/2017/11/22130127/Pug-puppy-standing-in-profile-on-a-white-background.jpg'
     - run: ruby core/latte.rb install brew-source
+    - run: ruby core/latte.rb install brew
 
 

core/latte.rb

@@ -6,18 +6,17 @@
 # module to download Packages
 module Pkg
   def self.findPkg(query)
-    @query = query
-    puts "Getting #{@query}"
-    $query = @query
+    $query = query
+    puts "Getting #{$query}"
     Pkg.getPkgfile
   end
 
   def self.getPkgfile
   ensure
-    $pfr = URI.open("https://raw.githubusercontent.com/Pandademic/Latte/master/packages/#{$query}.ini").read
-    $packageFileURL = "https://raw.githubusercontent.com/Pandademic/Latte/master/packages/#{$query}.ini"
-    puts "Package file:#{$pfr}"
-    system("wget #{$packageFileURL} --directory-prefix=/tmp/")
+    pfr = URI.open("https://raw.githubusercontent.com/Pandademic/Latte/master/packages/#{$query}.ini").read
+    packageFileURL = "https://raw.githubusercontent.com/Pandademic/Latte/master/packages/#{$query}.ini"
+    puts "Package file:#{pfr}"
+    system("wget #{packageFileURL} --directory-prefix=/tmp/")
     puts 'package file download complete'
     Pkg.downloadLatest
     # TODO: implement begin.resuce,else,ensure,end
@@ -27,11 +26,18 @@ def self.getPkgfile
   def self.downloadLatest
     file = IniFile.load("/tmp/#{$query}.ini")
     puts 'loaded file'
-    $pkgdata = file['package']
+    pkgdata = file['package']
     puts 'Release URL:'
-    puts $pkgdata['Release']
-    @RURL = $pkgdata['Release']
-    system("wget #{@RURL}")
+    puts pkgdata['Release']
+    zipsupport = pkgdata['Zip']
+    if zipsupport == true
+      # TODO: #13 add zipsupport to docs (package-example.ini)
+      @RURL = pkgdata['Release']
+      system("wget #{@RURL}")
+    else
+      @ISC = pkgdata['Isc'] # install command
+      system(@ISC.to_s)
+    end
   end
 end
 # FileUtils.touch('info.log')

packages/brew.ini

@@ -4,7 +4,6 @@ Version= 3.2.9
 Author= "Homebrew"
 License= "BSD 2-Clause Simplified License"
 Source="https://github.com/Homebrew/brew/"
-Release="https://github.com/Homebrew/brew/archive/refs/tags/3.2.9.zip"
-Zip=true
-Isc=true
+#Release="https://github.com/Homebrew/brew/archive/refs/tags/3.2.9.zip"
+Zip=false
 InstallCommand='/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"'