golden 0.5.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb7d6213bb1ec1308135221959c65ebe9e60d3451867ad900b7b59772ce30108
-  data.tar.gz: 826478ec45eff91699476be02d45b1319683c227faa60aa39c8a0ca68ecfc1f2
+  metadata.gz: 563173c01910c4a67941add131949b606c7691071808a05420fa44eeca9f5b58
+  data.tar.gz: 3c2705e9b064a45f4c74bfb21a52a39620908c54b63bae302232ac7e48896b94
 SHA512:
-  metadata.gz: b158e3292725f4bd05f8e55691aebff8110966e4b7806954d012caeae8a0366fd5a12c2ea8b9faefbf892c1047e59d5195bee7f41dc244606743976074157153
-  data.tar.gz: 5568c2e5e7c084e2e996bf3a2c70780fff6e4cd72278174dd5106217f89631f98db185d5a7d55fdf64d50583a444a2b6af32bc3bcf2aa5b540c2312c60fcb0c7
+  metadata.gz: 613d514dea41b19b19130f4cf99c6c7fe83f785336db8e5c45dff685a917de4b068d46879ae7835a7d658b4da3d7eead38fa0c24516ce959224b569b24aaf80d
+  data.tar.gz: 2613d2a111f93cff7cffad8beb6dafb31e3a5341556b723119924276cb2f223ed27bf85275772aba6e4d4e8fd58384be5d5cef35b9b469dde67d606900b08f6c

data/exe/golden

@@ -3,8 +3,20 @@ require "thor"
 require 'open3'
 require 'json'
 require_relative("../lib/crucible.rb")
+require_relative("../lib/golden/logo-banner.rb")
 module Golden
   class Cli < Thor
+    desc "add [path]", "add library at [path] to the list of known packages"
+    method_option :verbose, :aliases => "-v", :desc => "Build with verbose logging"
+    def add(path=nil)
+      self.load(options)
+      if(!path)
+        path = Dir.pwd
+      end
+      @crucible.add(path)
+      self.save
+    end
+
     desc "build [fileName]", "build library named [fileName]"
     method_option :verbose, :aliases => "-v", :desc => "Build with verbose logging"
     def build(fileName)
@@ -37,18 +49,22 @@ module Golden
     method_option :verbose, :aliases => "-v", :desc => "List with package detail"
     def list
       self.load(options)
-      if(!@crucible.packages || @crucible.packages.keys.length == 0)
+      if(!@crucible.packages || @crucible.packages.keys.length <= 1)
         puts "No libraries have yet been built. Navigate to a go project and build one using 'golden build (LibraryName).'"
       else
         puts "Golden has access to the following libraries:"
         if(@crucible.verbose?)
           @crucible.packages.each do |name, location|
-            puts "#{name}\t#{location}"
+            if(name != "_config")
+              puts "#{name}\t#{location}"
+            end
           end
         else
-          puts @crucible.packages.keys
+          packages = @crucible.packages.keys.filter{|pkg| pkg != "_config"}
+          puts packages
         end
       end
+      self.save
     end
 
     desc "install [fileName]", "install a library built with golden to the current ruby project"
@@ -61,6 +77,32 @@ module Golden
       else
         puts "No libraries named #{packageName} are yet known to golden. You can list all known libraries with 'golden list'"
       end
+      self.save
+    end
+
+    desc "version", "show gem version info"
+    def version
+      self.load({})
+      puts "Golden v#{Golden.gem_version}"
+      if(@crucible.get_config("since_last_update_check") != 10 || @crucible.silence_update_notifications?)
+        puts Golden::Logo.build
+      end
+      self.save
+    end
+
+    desc "config", "configure Golden"
+    method_option :true, :aliases => "-t", :desc => "set a boolean config option to true"
+    method_option :false, :aliases => "-f", :desc => "set a boolean config option to false"
+    def config(config_name, value=nil)
+      self.load({})
+      if(!!options[:true])
+        value = true
+      elsif(!!options[:false])
+        value = false
+      end
+
+      @crucible.config(config_name, value)
+      self.save
     end
 
     protected
@@ -68,6 +110,31 @@ module Golden
       @crucible = Golden::Crucible.new(options)
     end
     def save
+      count = @crucible.get_config("since_last_update_check")
+      if(count >= 10 && !@crucible.silence_update_notifications?)
+        if(@crucible.get_config("update_available"))
+          update = @crucible.get_config("update_available")
+        else
+          update = Golden.update_available?
+        end
+        if(!!update)
+          if(!@crucible.get_config("update_available") || @crucible.get_config("update_available").join('.') != update.join("."))
+            @crucible.config('update_available', update) # store any discovered update locally to prevent spamming rubygems
+          end
+          puts "\n"
+          puts Golden::Logo.build
+          puts "An update is available! You're currently using v#{Golden.gem_version}. "
+          puts "To update to v#{update.join(".")} type 'gem update golden'"
+          puts "\n"
+          puts "Be sure to also update the gemfile or gemspec for any projects that use golden to load libraries."
+          puts "To silence these notifications, run 'golden config silence_updates -t'"
+        end
+        @crucible.config("since_last_update_check", 0)
+      else
+        if(!@crucible.silence_update_notifications?) #stop incrementing if updates are silenced
+          @crucible.config("since_last_update_check", count+1)
+        end
+      end
       @crucible.save
     end
   end

data/lib/crucible.rb

@@ -13,8 +13,20 @@ module Golden
         else
           @packages = JSON.parse(File.open(@pkgLogFile).read)
         end
+        set_base_config
+      end
+      def add(path)
+        if(File.directory?(path))
+          golden_data = JSON.parse(File.open(File.expand_path(path)+"/golden.json").read)
+        elsif(File.basename == "golden" && File.extname(path) == "json")
+          golden_data = JSON.parse(File.open(path).read)
+        end
+        golden_data.keys.each do |libName|
+          puts "Adding #{libName}"
+          @packages[libName] = File.dirname(path)
+        end
+        self.save()
       end
-
       def build(fileName,dir)
         libName,extension = fileName.split('.')
         if(!extension)
@@ -67,17 +79,32 @@ module Golden
         golden_data[libName] = {}
         exports.each do |e|
           function_name = e.chomp.lstrip
-          declaration_regex = Regexp.new("func #{function_name}\s?\((?<args>.*)\) (?<returns>.*) {")
+          declaration_regex = Regexp.new('\s*'+"func #{function_name}\s?\((?<args>.*)\) (?<returns>.*) {")
           export_data = {}
           export_data[:args] = {}
-          args = source_code.scan(declaration_regex).flatten[0]
+          declaration = source_code.scan(declaration_regex).flatten
+          args = declaration[0]
           args = args[1,args.length-2]
           args = args.split(',')
-          args.each do |arg|
+
+          args.each_with_index do |arg, i|
             name, type = arg.split(" ")
-            export_data[:args][name] = type
+            if(!!type && type != "")
+              export_data[:args][name] = type
+            else
+              type = nil
+              next_args = args.slice(i+1, args.length)
+              next_args.each do |next_arg|
+                potential_type = next_arg.split(" ")[1]
+                if(!!potential_type && !type && potential_type != "")
+                  type = potential_type
+                end
+              end
+              export_data[:args][name] = type
+            end
           end
-          export_data[:returns] = source_code.scan(declaration_regex).flatten[1]
+
+          export_data[:returns] = declaration[1]
           # require "pry"
           # binding.pry
           golden_data[libName][function_name] = export_data
@@ -92,7 +119,15 @@ module Golden
         end
         @packages[libName] = dir
       end
-
+      def config(config_name, value)
+        @packages["_config"][config_name] = value
+      end
+      def get_config(config_name)
+        @packages["_config"][config_name]
+      end
+      def unset_config(config_name)
+        @packages["_config"].delete(config_name)
+      end
       def install(packageName)
         cwd = Dir.pwd
         extDestination = File.expand_path(cwd+"/bin")
@@ -118,11 +153,25 @@ module Golden
       end
       def clear
         @packages = {}
+        set_base_config
         save
       end
+      def set_base_config
+        if(!@packages["_config"])
+          @packages["_config"] = {}
+          self.save
+        end
+        if(!@packages["_config"]["since_last_update_check"])
+          @packages["_config"]["since_last_update_check"] = 0
+          self.save
+        end
+      end
       def verbose?
         return (!!@options && !!@options[:verbose])
       end
+      def silence_update_notifications?
+        return (@packages["_config"]["silence_updates"])
+      end
       def save
         # @pkgLogFile = File.expand_path(File.dirname(__FILE__)+"/../packages.json") # Installation specific package log
         File.open(@pkgLogFile,"w") do |f|

data/lib/golden.rb

@@ -1,6 +1,7 @@
 require 'ffi'
 require 'json'
 require "crucible"
+require_relative("golden/version")
 module Golden
   def self.require(library)
     golden_data = self.load

data/lib/golden/logo-banner.rb

@@ -0,0 +1,11 @@
+require 'tty-font'
+module Golden
+  module Logo
+    def self.build
+      require 'pastel'
+      pastel = Pastel.new
+      font = TTY::Font.new("standard")
+      return pastel.yellow(font.write("Golden"))
+    end
+  end
+end

data/lib/golden/version.rb

@@ -0,0 +1,23 @@
+require 'rubygems'
+module Golden
+  def self.gem_version
+    Gem::Version.new VERSION::STRING
+  end
+  def self.update_available? # Returns true if update is required
+    current = Gem.latest_version_for("golden").segments
+    if((VERSION::MAJOR < current[0]) || (VERSION::FEATURE < current[1]) || (VERSION::PATCH < current[2]))
+      return current
+    end
+  end
+  module VERSION
+    MAJOR = 0
+    FEATURE = 6
+    PATCH  = 2
+    PRE   = "0"
+    if(PRE && PRE != "0")
+      STRING = [MAJOR, FEATURE, PATCH, PRE].compact.join(".")
+    else
+      STRING = [MAJOR, FEATURE, PATCH].compact.join(".")
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: golden
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Greg Mikeska
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-23 00:00:00.000000000 Z
+date: 2021-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -24,6 +24,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.14'
+- !ruby/object:Gem::Dependency
+  name: tty-font
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+- !ruby/object:Gem::Dependency
+  name: pastel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.0
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -92,6 +134,8 @@ files:
 - exe/golden
 - lib/crucible.rb
 - lib/golden.rb
+- lib/golden/logo-banner.rb
+- lib/golden/version.rb
 homepage: https://github.com/gmikeska/golden
 licenses: []
 metadata: {}
@@ -99,6 +143,7 @@ post_install_message:
 rdoc_options: []
 require_paths:
 - lib
+- lib/golden
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -110,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Golden is a development tool that makes it easier to wrap Go libraries for