instrumental-components 0.1.2 → 0.1.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9d7b4164eab29cdccb4586188c0480cba5f4834d65089e35f08f59c1b064500
-  data.tar.gz: 67e0a39edfd96ce115499b540f68b3b131edff234a74437cc306c0e3a84df3a5
+  metadata.gz: fe12474095d5a24ed6024f13ad07fc09a1c06ff1975cc593ca1143c957b78203
+  data.tar.gz: be82faed7a3f4873cf1050d68b154614f3154b4b2a611a261a0385d92814694d
 SHA512:
-  metadata.gz: 9609e5ab398a77557e965e6183ddba2710d9fc6eb888733de87738a0d56bcc0ad72bf02f13ca86aa935b8e79b4867f8a2533881200e25bfbea4b97f981a7b6cf
-  data.tar.gz: 26fe58b9a0e028ff4804a724d7706b1350466040b67d563da8b5ce83b921dc5a01d210d2b87996b8a7408b19d81c94a0c9eceead730a98a8afc8881c8dcd350b
+  metadata.gz: 83d8efe650aee61417a7655a759c4010270c6caf1dff170a7db7cb29ae3c72171ae455a3fa1ace78c0a7ede0018fb205c5a894211e83ed5653388813c70099dc
+  data.tar.gz: 69d5beb80cf48f029ede27496e16fedb7cc96eec8a026444c4dd339bb190d1073adf382a4f6890a1ebedeb1f6cc46bc48e950e5ffc6de895d3d9b8cdad3a03f0

data/bin/install-instrumental

@@ -2,10 +2,11 @@
 
 require 'instrumental-components'
 require 'optparse'
+require 'yaml'
 
 options = {}
 OptionParser.new do |opts|
-  opts.banner = "Usage: install-instrumental --license_key=LICENSE_KEY --email=EMAIL"
+  opts.banner = "Usage: install-instrumental [--license_key=LICENSE_KEY] [--email=EMAIL]"
 
   opts.on("--license_key=LICENSE_KEY", "License key for Instrumental Components") do |key|
     options[:license_key] = key
@@ -16,9 +17,38 @@ OptionParser.new do |opts|
   end
 end.parse!
 
+# Check for license.yml file if flags are not provided
 unless options[:license_key] && options[:email]
-  puts "Error: Both --license_key and --email are required"
-  exit 1
+  license_yml_path = '.instrumental/license.yml'
+  if File.exist?(license_yml_path)
+    begin
+      license_data = YAML.load_file(license_yml_path)
+      options[:license_key] ||= license_data['license_key']
+      options[:email] ||= license_data['email']
+    rescue => e
+      puts "Error reading license.yml: #{e.message}"
+    end
+  end
+end
+
+# Prompt for any missing information
+unless options[:license_key] && options[:email]
+
+  unless options[:license_key]
+    print "Enter your Instrumental Components license key (find this in your account at https://instrumental.dev): "
+    options[:license_key] = gets.chomp.strip
+  end
+
+  unless options[:email]
+    print "Enter your the email address you used for your account on https://instrumental.dev: "
+    options[:email] = gets.chomp.strip
+  end
+
+  # Validate that we got non-empty values
+  if options[:license_key].empty? || options[:email].empty?
+    puts "\nError: Both license key and email are required."
+    exit 1
+  end
 end
 
 installer = InstrumentalComponents::Installer.new(options[:license_key], options[:email])

data/bin/latest-instrumental-version

@@ -0,0 +1,15 @@
+#!/usr/bin/env ruby
+
+require 'instrumental-components'
+require 'optparse'
+require 'yaml'
+require 'json'
+require 'open-uri'
+
+options = {}
+OptionParser.new do |opts|
+  opts.banner = "Usage: latest-instrumental-version"
+end.parse!
+
+version_checker = InstrumentalComponents::VersionChecker.new
+version_checker.check

data/lib/instrumental-components/version_checker.rb

@@ -0,0 +1,49 @@
+require 'open-uri'
+require 'json'
+require 'dotenv'
+
+module InstrumentalComponents
+  class VersionChecker
+    def check
+      # Load .env file if it exists (for local development only)
+      if File.exist?('.env')
+        Dotenv.load
+      end
+
+      latest_version = fetch_latest_version
+      current_version = get_current_version
+
+      if current_version == latest_version
+        puts "You're on the latest version!"
+      else
+        puts "You're running version #{current_version}. To update to the latest version (#{latest_version}), run:\nbundle exec install-instrumental"
+      end
+    end
+
+    private
+
+    def fetch_latest_version
+      domain = ENV['INSTRUMENTAL_DOMAIN'] || 'https://instrumental.dev'
+      unless 'https://instrumental.dev' == domain
+        puts "Using domain: #{domain}" # Confirm that we're in local development mode
+      end
+      response = URI.open("#{domain}/gem_downloads/get_current_version")
+      data = JSON.parse(response.read)
+      data['version']
+    rescue => e
+      puts "Error fetching latest version: #{e.message}"
+      exit 1
+    end
+
+    def get_current_version
+      return nil unless File.exist?('Gemfile.lock')
+
+      content = File.read('Gemfile.lock')
+      if match = content.match(/instrumental-components-library\s*\(([^)]+)\)/)
+        match[1]
+      else
+        nil
+      end
+    end
+  end
+end

data/lib/instrumental-components.rb

@@ -2,6 +2,7 @@ require 'open-uri'
 require 'fileutils'
 require 'json'
 require 'dotenv'
+require 'instrumental-components/version_checker'
 
 module InstrumentalComponents
   class Installer
@@ -11,7 +12,11 @@ module InstrumentalComponents
     end
 
     def install
-      puts "📥 Downloading the latest version of Instrumental Components..."
+      if updating?
+        puts "📥 Updating to the latest version of Instrumental Components..."
+      else
+        puts "📥 Downloading the latest version of Instrumental Components..."
+      end
 
       begin
         # Load .env file if it exists (for local development only)
@@ -32,9 +37,15 @@ module InstrumentalComponents
         puts "Running 'bundle install'..."
         run_bundle_install
 
-        puts ""
-        puts "🚀 Running the Instrumental Components installer..."
-        run_installer
+        if updating?
+          puts ""
+          puts "🔄 Updating Instrumental Components..."
+          system("bundle update instrumental-components-library")
+        else
+          puts ""
+          puts "🚀 Running the Instrumental Components installer..."
+          run_installer
+        end
 
         puts ""
       rescue => e
@@ -46,6 +57,23 @@ module InstrumentalComponents
 
     private
 
+    def updating?
+      # Only consider it updating if the gem is in the current project's Gemfile
+      # and Gemfile.lock, not just installed system-wide
+      gemfile_has_gem? && gemfile_lock_has_gem? && File.exist?('Gemfile.lock')
+    end
+
+    def gemfile_has_gem?
+      return false unless File.exist?('Gemfile')
+      # Use a more precise regex to match the gem declaration
+      File.read('Gemfile').match?(/^\s*gem\s+['"]instrumental-components-library['"]/)
+    end
+
+    def gemfile_lock_has_gem?
+      return false unless File.exist?('Gemfile.lock')
+      File.read('Gemfile.lock').include?('instrumental-components-library (')
+    end
+
     def download_gem
       # For local development, set INSTRUMENTAL_DOMAIN=http://localhost:3000 in .env
       # This allows testing against a local server while developing the gem
@@ -102,11 +130,16 @@ module InstrumentalComponents
 
       gemfile_content = File.read(gemfile_path)
 
-      unless gemfile_content.include?("gem 'instrumental-components-library'")
+      # Check if the gem is already in any development group
+      unless gemfile_content.match?(/^\s*gem\s+['"]instrumental-components-library['"]/)
         if gemfile_content.include?("group :development")
-          # Add to existing development group
-          gemfile_content.gsub!(/group :development\s+do/) do |match|
-            "#{match}\n  gem 'instrumental-components-library'"
+          # Find the last development group and add the gem there
+          gemfile_content.gsub!(/(group :development\s+do.*?)(?=group|$)/m) do |match|
+            if match.end_with?("end")
+              match.sub(/end\s*$/, "  gem 'instrumental-components-library'\nend")
+            else
+              match + "  gem 'instrumental-components-library'\n"
+            end
           end
         else
           # Create new development group

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: instrumental-components
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.31
 platform: ruby
 authors:
 - Brian Casel
 bindir: bin
 cert_chain: []
-date: 2025-05-13 00:00:00.000000000 Z
+date: 2025-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: open-uri
@@ -42,11 +42,14 @@ email:
 - support@instrumental.dev
 executables:
 - install-instrumental
+- latest-instrumental-version
 extensions: []
 extra_rdoc_files: []
 files:
 - bin/install-instrumental
+- bin/latest-instrumental-version
 - lib/instrumental-components.rb
+- lib/instrumental-components/version_checker.rb
 homepage: https://instrumental.dev
 licenses:
 - Nonstandard