makit 0.0.47 → 0.0.49

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13595d385d61aded5a1b070143d89cc2454b4791e1bdec3cddbbf415ef4d8835
-  data.tar.gz: f6c7b0892cae10ba34183bde1fd6f78a7b4fb7ac8d7fbed45c69f8ae660f23d2
+  metadata.gz: c1126dba0ea27b77b9b5d9fb32689f47878419506aee8eb9a4b177b632148832
+  data.tar.gz: e388dc96e51162a816d97ea373241edf0ff9b7eaecd640763a3a4196ddd038ef
 SHA512:
-  metadata.gz: 15930c7a638107807b538ace1ae3c698efa7479df1b9e695edaf4eaf0bfd100ca763aeb265939924b0d4b4821fe05aadae2cf92c8188f54f84411128748d1255
-  data.tar.gz: 0db3b5372728fc41293a93f155f3e62c05ca463a4d849260e6f6f2b6fde0f01f25987b893420d15695114d017a2a6fbd84f82d656e3b356483c62f3838047dba
+  metadata.gz: bae18f395ed21a74a5c75dc5b039ca92e495083a15f469bda845dd35873f8f481a0768532984719091baeb16be5f458b4733df48b2beff58cdb5733ff0c6fb5a
+  data.tar.gz: d535921e763f176a56c0432ce7dc22240b43eacf4a032e08da1de3b14b17b6030dfbad6851f8e83be0b92c0652a61b91c4a120c9a73fb5c26960c57b2a6389b4

data/lib/makit/command_runner.rb

@@ -124,8 +124,6 @@ module Makit
       command
     end
 
-    
-
     def show_command(command)
       if command.exit_code != 0
         puts Makit::CommandRunner.get_command_summary(command) + " (exit code #{command.exit_code})".colorize(:default)
@@ -185,6 +183,7 @@ module Makit
     def cache_try(command_request)
       cache_try(command_request, @default_modified)
     end
+
     def cache_try(command_request, timestamp)
       command_request.exit_on_error = false
       cache_run(command_request, timestamp)

data/lib/makit/dotnet.rb

@@ -21,6 +21,13 @@ module Makit
       end
     end
 
+    def self.set_project_target_framework(project_hint, target_framework)
+      project_path = find_project(project_hint)
+      project_content = File.read(project_path)
+      project_content.gsub!(/<TargetFramework>.*<\/TargetFramework>/, "<TargetFramework>#{target_framework}</TargetFramework>")
+      File.write(project_path, project_content)
+    end
+
     def self.find_project(project_hint)
       matches = []
       Dir.glob("**/*.csproj").each do |project_path|

data/lib/makit/humanize.rb

@@ -103,15 +103,15 @@ module Makit
       parts = []
       parts << "#{days} days" if days > 0
       parts << "#{hours} hours" if hours > 0
-      if(minutes > 0)
-        if(minutes == 1)
+      if (minutes > 0)
+        if (minutes == 1)
           parts << "1 minute"
         else
           parts << "#{minutes} minutes"
         end
       end
-      if(seconds > 0)
-        if(seconds == 1)
+      if (seconds > 0)
+        if (seconds == 1)
           parts << "1 second"
         else
           parts << "#{seconds} seconds"
@@ -120,7 +120,7 @@ module Makit
       #parts << "#{seconds} seconds" if seconds > 0
       parts << "#{milliseconds} milliseconds" if milliseconds > 0 && seconds < 1
 
-      if(parts.length == 0)
+      if (parts.length == 0)
         parts << "0 seconds"
       end
       parts.join(", ")

data/lib/makit/mp/string_mp.rb

@@ -19,8 +19,6 @@ class String
     end
   end
 
-  
-
   def cache_run()
     command = self
     Makit::RUNNER.cache_run(Makit::RUNNER::parse_command_request(command))
@@ -67,7 +65,6 @@ class String
     Makit::RUNNER.cache_try(Makit::RUNNER::parse_command_request(command), timestamp)
   end
 
-
   # Read a value from a JSON file
   # key is a string with the key to read, e.g. "AzureAd.Authority"
   def get_json_value(key)

data/lib/makit/show.rb

@@ -35,7 +35,7 @@ module Makit
         modified = File.mtime(path)
         age = (Time.now - modified).to_f
         humanized_size = Makit::Humanize.get_humanized_size(File.size(path))
-        puts "#{file_symbol} ".colorize(:grey) + "#{humanized_size.rjust(10)} ".colorize(:cyan) +" #{path} ".colorize(:grey)
+        puts "#{file_symbol} ".colorize(:grey) + "#{humanized_size.rjust(10)} ".colorize(:cyan) + " #{path} ".colorize(:grey)
       else
         puts "#{path} does not exist"
       end
@@ -93,16 +93,14 @@ module Makit
       #case switch
       #if extension == ".csproj"
       #  version = Makit::Version.detect_from_file(path, /<Version>([-\w\d.]+)</)
-     #   if version.empty?
-     #     puts "no version found in #{path}"
-     #   else
-    #      puts "  #{version}".colorize(:green) + " found in #{path}".colorize(:grey)
-    #    end
-    #  else 
-    ##    puts "unrecognized file type"
+      #   if version.empty?
+      #     puts "no version found in #{path}"
+      #   else
+      #      puts "  #{version}".colorize(:green) + " found in #{path}".colorize(:grey)
+      #    end
+      #  else
+      ##    puts "unrecognized file type"
       #end
     end
   end
 end
-
-

data/lib/makit/v1/makit.v1_pb.rb

@@ -2,11 +2,10 @@
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: lib/makit/v1/makit.v1.proto
 
-require 'google/protobuf'
-
-require 'google/protobuf/timestamp_pb'
-require 'google/protobuf/duration_pb'
+require "google/protobuf"
 
+require "google/protobuf/timestamp_pb"
+require "google/protobuf/duration_pb"
 
 descriptor_data = "\n\x1blib/makit/v1/makit.v1.proto\x12\x08makit.v1\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x1egoogle/protobuf/duration.proto\"\x92\x02\n\rDotNetProject\x12\x10\n\x08template\x18\x01 \x01(\t\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x0e\n\x06output\x18\x03 \x01(\t\x12\x10\n\x08packages\x18\x04 \x03(\t\x12\x12\n\nreferences\x18\x05 \x03(\t\x12\n\n\x02os\x18\x06 \x01(\t\x12\x10\n\x08\x63ommands\x18\x07 \x03(\t\x12-\n\nbuild_args\x18\x08 \x03(\x0b\x32\x19.makit.v1.DotNetBuildArgs\x12\x31\n\x0cpublish_args\x18\t \x03(\x0b\x32\x1b.makit.v1.DotNetPublishArgs\x12+\n\ttest_args\x18\n \x03(\x0b\x32\x18.makit.v1.DotNetTestArgs\"8\n\x0f\x44otNetBuildArgs\x12\x15\n\rconfiguration\x18\x01 \x01(\t\x12\x0e\n\x06output\x18\x02 \x01(\t\":\n\x11\x44otNetPublishArgs\x12\x15\n\rconfiguration\x18\x01 \x01(\t\x12\x0e\n\x06output\x18\x02 \x01(\t\"7\n\x0e\x44otNetTestArgs\x12\x15\n\rconfiguration\x18\x01 \x01(\t\x12\x0e\n\x06output\x18\x02 \x01(\t\"\xa8\x01\n\x07Project\x12\x16\n\x0egit_remote_url\x18\x01 \x01(\t\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x11\n\tartifacts\x18\x03 \x03(\t\x12\x32\n\x10\x63ommand_requests\x18\x04 \x03(\x0b\x32\x18.makit.v1.CommandRequest\x12\x30\n\x0f\x64otnet_projects\x18\x05 \x03(\x0b\x32\x17.makit.v1.DotNetProject\"\xa5\x01\n\x0e\x43ommandRequest\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x11\n\targuments\x18\x02 \x03(\t\x12+\n\x07timeout\x18\x03 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\x11\n\tdirectory\x18\x04 \x01(\t\x12\x0c\n\x04task\x18\x05 \x01(\t\x12\r\n\x05input\x18\x06 \x01(\x0c\x12\x15\n\rexit_on_error\x18\x07 \x01(\x08\"\x91\x02\n\x07\x43ommand\x12\n\n\x02id\x18\x01 \x01(\x03\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x11\n\targuments\x18\x03 \x03(\t\x12\x11\n\texit_code\x18\x04 \x01(\x05\x12\r\n\x05input\x18\x05 \x01(\x0c\x12\x0e\n\x06output\x18\x06 \x01(\x0c\x12\r\n\x05\x65rror\x18\x07 \x01(\x0c\x12.\n\nstarted_at\x18\x08 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12+\n\x08\x64uration\x18\t \x01(\x0b\x32\x19.google.protobuf.Duration\x12\x0c\n\x04user\x18\n \x01(\t\x12\x0e\n\x06\x64\x65vice\x18\x0b \x01(\t\x12\n\n\x02os\x18\x0c \x01(\t\x12\x11\n\tdirectory\x18\r \x01(\t\"I\n\rConfiguration\x12\x0c\n\x04name\x18\x01 \x01(\t\x12*\n\x08\x63ommands\x18\x02 \x03(\x0b\x32\x18.makit.v1.CommandRequest\"3\n\rGitRepository\x12\x0b\n\x03url\x18\x01 \x01(\t\x12\x15\n\rrelative_path\x18\x02 \x01(\t\"h\n\x0bGitLogEntry\x12\x0e\n\x06\x63ommit\x18\x01 \x01(\t\x12\x0e\n\x06\x61uthor\x18\x02 \x01(\t\x12(\n\x04\x64\x61te\x18\x03 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\x0f\n\x07message\x18\x04 \x01(\t\"\xc8\x01\n\nMakeResult\x12\x12\n\nrepository\x18\x01 \x01(\t\x12\x0e\n\x06\x63ommit\x18\x02 \x01(\t\x12\x0e\n\x06\x62ranch\x18\x03 \x01(\t\x12\x0b\n\x03tag\x18\x04 \x01(\t\x12\x0e\n\x06\x64\x65vice\x18\x05 \x01(\t\x12\x1a\n\x12runtime_identifier\x18\x06 \x01(\t\x12#\n\x08\x63ommands\x18\x07 \x03(\x0b\x32\x11.makit.v1.Command\x12\x14\n\x0cinitial_size\x18\x08 \x01(\x05\x12\x12\n\nfinal_size\x18\t \x01(\x05\"?\n\rDotNetNewArgs\x12\x10\n\x08template\x18\x01 \x01(\t\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x0e\n\x06output\x18\x03 \x01(\t\"^\n\rManifestEntry\x12\x0c\n\x04path\x18\x01 \x01(\t\x12\x31\n\rlast_modified\x18\x02 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\x0c\n\x04size\x18\x03 \x01(\x03**\n\x08Language\x12\x08\n\x04RUBY\x10\x00\x12\n\n\x06\x43SHARP\x10\x01\x12\x08\n\x04RUST\x10\x02*,\n\x0bPackageType\x12\x07\n\x03GEM\x10\x00\x12\t\n\x05NUGET\x10\x01\x12\t\n\x05\x43RATE\x10\x03\x32H\n\x0e\x43ommandService\x12\x36\n\x07\x45xecute\x12\x18.makit.v1.CommandRequest\x1a\x11.makit.v1.Commandb\x06proto3"
 

data/lib/makit/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Makit
-  VERSION = "0.0.47"
+  VERSION = "0.0.49"
 
   class Version
     # given an array of version strings, return the highest version
@@ -10,7 +10,7 @@ module Makit
     end
 
     def self.get_version_from_file(path)
-      if(!File.exist?(path))
+      if (!File.exist?(path))
         raise "file #{path}does not exist"
       end
 
@@ -24,7 +24,7 @@ module Makit
         Makit::Version.detect_from_file(path, /<Version>([-\w\d.]+)</)
       when ".wxs"
         Makit::Version.detect_from_file(path, / Version="([\d\.]+)"/)
-      else 
+      else
         raise "unrecognized file type"
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: makit
 version: !ruby/object:Gem::Version
-  version: 0.0.47
+  version: 0.0.49
 platform: ruby
 authors:
 - Lou Parslow