gloo 4.2.0 → 4.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf2e3b4867f61cc9d1efcf48e5bbd409301cd981c3c060fd5da9d44341886068
-  data.tar.gz: d792df8a9e6b02db122bc4e6a59ed6169bd2cef0de02fe60a9c8c0f024551dc0
+  metadata.gz: f68137523fd4bda7f48c75dc97b99da12dd24b4bc12dbe6ec1a5d608b05e7ab3
+  data.tar.gz: 611305b9634cf5d1742ab3241c74c57b14edb19d233606ec1fe0d35401c6dc2f
 SHA512:
-  metadata.gz: b17991f005f58b517044bd2ac2cc08f21f67f5e8bf7023cbfc3895ddbf24a7d3fdc88ed8c4ce61489c140c6d20488a2516988d72111066b2850eb92e3238ad96
-  data.tar.gz: 5fe442bd9578e773785a66c08eb1e12b454b0e1f2d7be78401ebc893a432b066a7c94c07e69c384384c24bb26c660840cb2e45b32c61b1d431cf19c3e134c1ff
+  metadata.gz: ecf31d454b8bcfcaac603c73ab3bcb1b8b0d5e551a919f38e7e80f52add50000284bf5426f1f8c50050f4476bfed0528d7ff74ad1aee02fd0951fe09db1103aa
+  data.tar.gz: 13f51ba5152a76aa032b28f4787ec7bfc67df616339d9ab079fc253fdc37f096c177e4ef81bd3d4e34dd85a5a338d493ada871a0e29e5045db9d2cfedf91dea5

data/gloo.gemspec

@@ -46,7 +46,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'mysql2', '~> 0.5', '>= 0.5.3'
   spec.add_dependency 'sqlite3', '~> 1.4', '>= 1.4.2'
   spec.add_dependency 'os', '~> 1.1', '>= 1.1.4'
-  spec.add_dependency 'pg', '~> 1.5.4'
+  # spec.add_dependency 'pg', '~> 1.5.4'
   spec.add_dependency 'thin', '~> 1.8.2'
   spec.add_dependency 'redcarpet', '~> 3.6.0'
   spec.add_dependency 'bcrypt', '~> 3.1.20'

data/lib/VERSION

@@ -1 +1 @@
-4.2.0
+4.3.0

data/lib/VERSION_NOTES

@@ -1,3 +1,11 @@
+4.3.0 - 2025.07.02
+ - Removes postgres dependency (for now)
+
+
+4.2.1 - 2025.05.15
+ - Fixes bug with begin and end month date messages
+
+
 4.2.0 - 2025.05.15
  - Adds add and sub messages to date objects
 

data/lib/gloo/objs/data/pg.rb

@@ -1,216 +1,216 @@
-# Author::    Eric Crane  (mailto:eric.crane@mac.com)
-# Copyright:: Copyright (c) 2023 Eric Crane.  All rights reserved.
-#
-# A Postgres database connection.
-#
-#   https://rubygems.org/gems/pg/versions/0.18.4
-#   https://github.com/ged/ruby-pg
-#   
-require 'pg'
-
-module Gloo
-  module Objs
-    class Pg < Gloo::Core::Obj
-
-      KEYWORD = 'postgres'.freeze
-      KEYWORD_SHORT = 'pg'.freeze
-
-      HOST = 'host'.freeze
-      DB = 'database'.freeze
-      USER = 'username'.freeze
-      PASSWD = 'password'.freeze
-
-      #
-      # The name of the object type.
-      #
-      def self.typename
-        return KEYWORD
-      end
-
-      #
-      # The short name of the object type.
-      #
-      def self.short_typename
-        return KEYWORD_SHORT
-      end
-
-      # ---------------------------------------------------------------------
-      #    Children
-      # ---------------------------------------------------------------------
-
-      #
-      # Does this object have children to add when an object
-      # is created in interactive mode?
-      # This does not apply during obj load, etc.
-      #
-      def add_children_on_create?
-        return true
-      end
-
-      #
-      # Add children to this object.
-      # This is used by containers to add children needed
-      # for default configurations.
-      #
-      def add_default_children
-        fac = @engine.factory
-        fac.create_string HOST, nil, self
-        fac.create_string DB, nil, self
-        fac.create_string USER, nil, self
-        fac.create_string PASSWD, nil, self
-      end
-
-      # ---------------------------------------------------------------------
-      #    Messages
-      # ---------------------------------------------------------------------
-
-      #
-      # Get a list of message names that this object receives.
-      #
-      def self.messages
-        return super + [ 'verify' ]
-      end
-
-      #
-      # SSH to the host and execute the command, then update result.
-      #
-      def msg_verify
-        return unless connects?
-
-        @engine.heap.it.set_to true
-      end
-
-      # ---------------------------------------------------------------------
-      #    DB functions (all database connections)
-      # ---------------------------------------------------------------------
-
-      #
-      # Open a connection and execute the SQL statement.
-      # Return the resulting data.
-      #
-      def query( sql, params = nil )
-        heads = []
-        data = []
-        client = pg_conn
-
-        if params
-          param_arr =  []
-          params.each do |p|
-            param_arr << { :value => p, :type => 0, :format => 0 }
-          end
-          rs = client.exec_params( sql, params )
-        else
-          rs = client.exec( sql )
-        end
-
-        if rs && ( rs.count > 0 )
-          rs[0].each do |name, val|
-            heads << name
-          end
-          rs.each_with_index do |row, index|
-            arr = []
-            row.each do |name, val|
-              arr << val
-            end
-            data << arr
-          end
-        end
-
-        return [ heads, data ]
-      end
-
-      # 
-      # Based on the result set, build a QueryResult object.
-      # 
-      def get_query_result( result )
-        return QueryResult.new result[0], result[1], @engine
-      end
-
-
-      # ---------------------------------------------------------------------
-      #    Private functions
-      # ---------------------------------------------------------------------
-
-      private
-
-      #
-      # Get the host from the child object.
-      # Returns nil if there is none.
-      #
-      def host_value
-        o = find_child HOST
-        return nil unless o
-
-        o = Gloo::Objs::Alias.resolve_alias( @engine, o )
-        return o.value
-      end
-
-      #
-      # Get the Database name from the child object.
-      # Returns nil if there is none.
-      #
-      def db_value
-        o = find_child DB
-        return nil unless o
-
-        o = Gloo::Objs::Alias.resolve_alias( @engine, o )
-        return o.value
-      end
-
-      #
-      # Get the Username from the child object.
-      # Returns nil if there is none.
-      #
-      def user_value
-        o = find_child USER
-        return nil unless o
-
-        o = Gloo::Objs::Alias.resolve_alias( @engine, o )
-        return o.value
-      end
-
-      #
-      # Get the Password name from the child object.
-      # Returns nil if there is none.
-      #
-      def passwd_value
-        o = find_child PASSWD
-        return nil unless o
-
-        o = Gloo::Objs::Alias.resolve_alias( @engine, o )
-        return o.value
-      end
-
-      #
-      # Try the connection and make sure it works.
-      # Returns true if we can establish a connection.
-      #
-      def connects?
-        begin
-          result = pg_conn.exec( "SELECT NOW()" )
-        rescue => e
-          @engine.log_exception e
-          @engine.heap.it.set_to false
-          return false
-        end
-        return true
-      end
-
-      # 
-      # Get the PG connection.
-      # 
-      def pg_conn
-        if host_value
-          conn = PG.connect(
-            host_value, 5432, '', '', 
-            db_value, 
-            user_value, 
-            passwd_value )
-        else
-          conn = PG.connect( dbname: db_value )
-        end
-      end
-
-    end
-  end
-end
+# # Author::    Eric Crane  (mailto:eric.crane@mac.com)
+# # Copyright:: Copyright (c) 2023 Eric Crane.  All rights reserved.
+# #
+# # A Postgres database connection.
+# #
+# #   https://rubygems.org/gems/pg/versions/0.18.4
+# #   https://github.com/ged/ruby-pg
+# #   
+# require 'pg'
+
+# module Gloo
+#   module Objs
+#     class Pg < Gloo::Core::Obj
+
+#       KEYWORD = 'postgres'.freeze
+#       KEYWORD_SHORT = 'pg'.freeze
+
+#       HOST = 'host'.freeze
+#       DB = 'database'.freeze
+#       USER = 'username'.freeze
+#       PASSWD = 'password'.freeze
+
+#       #
+#       # The name of the object type.
+#       #
+#       def self.typename
+#         return KEYWORD
+#       end
+
+#       #
+#       # The short name of the object type.
+#       #
+#       def self.short_typename
+#         return KEYWORD_SHORT
+#       end
+
+#       # ---------------------------------------------------------------------
+#       #    Children
+#       # ---------------------------------------------------------------------
+
+#       #
+#       # Does this object have children to add when an object
+#       # is created in interactive mode?
+#       # This does not apply during obj load, etc.
+#       #
+#       def add_children_on_create?
+#         return true
+#       end
+
+#       #
+#       # Add children to this object.
+#       # This is used by containers to add children needed
+#       # for default configurations.
+#       #
+#       def add_default_children
+#         fac = @engine.factory
+#         fac.create_string HOST, nil, self
+#         fac.create_string DB, nil, self
+#         fac.create_string USER, nil, self
+#         fac.create_string PASSWD, nil, self
+#       end
+
+#       # ---------------------------------------------------------------------
+#       #    Messages
+#       # ---------------------------------------------------------------------
+
+#       #
+#       # Get a list of message names that this object receives.
+#       #
+#       def self.messages
+#         return super + [ 'verify' ]
+#       end
+
+#       #
+#       # SSH to the host and execute the command, then update result.
+#       #
+#       def msg_verify
+#         return unless connects?
+
+#         @engine.heap.it.set_to true
+#       end
+
+#       # ---------------------------------------------------------------------
+#       #    DB functions (all database connections)
+#       # ---------------------------------------------------------------------
+
+#       #
+#       # Open a connection and execute the SQL statement.
+#       # Return the resulting data.
+#       #
+#       def query( sql, params = nil )
+#         heads = []
+#         data = []
+#         client = pg_conn
+
+#         if params
+#           param_arr =  []
+#           params.each do |p|
+#             param_arr << { :value => p, :type => 0, :format => 0 }
+#           end
+#           rs = client.exec_params( sql, params )
+#         else
+#           rs = client.exec( sql )
+#         end
+
+#         if rs && ( rs.count > 0 )
+#           rs[0].each do |name, val|
+#             heads << name
+#           end
+#           rs.each_with_index do |row, index|
+#             arr = []
+#             row.each do |name, val|
+#               arr << val
+#             end
+#             data << arr
+#           end
+#         end
+
+#         return [ heads, data ]
+#       end
+
+#       # 
+#       # Based on the result set, build a QueryResult object.
+#       # 
+#       def get_query_result( result )
+#         return QueryResult.new result[0], result[1], @engine
+#       end
+
+
+#       # ---------------------------------------------------------------------
+#       #    Private functions
+#       # ---------------------------------------------------------------------
+
+#       private
+
+#       #
+#       # Get the host from the child object.
+#       # Returns nil if there is none.
+#       #
+#       def host_value
+#         o = find_child HOST
+#         return nil unless o
+
+#         o = Gloo::Objs::Alias.resolve_alias( @engine, o )
+#         return o.value
+#       end
+
+#       #
+#       # Get the Database name from the child object.
+#       # Returns nil if there is none.
+#       #
+#       def db_value
+#         o = find_child DB
+#         return nil unless o
+
+#         o = Gloo::Objs::Alias.resolve_alias( @engine, o )
+#         return o.value
+#       end
+
+#       #
+#       # Get the Username from the child object.
+#       # Returns nil if there is none.
+#       #
+#       def user_value
+#         o = find_child USER
+#         return nil unless o
+
+#         o = Gloo::Objs::Alias.resolve_alias( @engine, o )
+#         return o.value
+#       end
+
+#       #
+#       # Get the Password name from the child object.
+#       # Returns nil if there is none.
+#       #
+#       def passwd_value
+#         o = find_child PASSWD
+#         return nil unless o
+
+#         o = Gloo::Objs::Alias.resolve_alias( @engine, o )
+#         return o.value
+#       end
+
+#       #
+#       # Try the connection and make sure it works.
+#       # Returns true if we can establish a connection.
+#       #
+#       def connects?
+#         begin
+#           result = pg_conn.exec( "SELECT NOW()" )
+#         rescue => e
+#           @engine.log_exception e
+#           @engine.heap.it.set_to false
+#           return false
+#         end
+#         return true
+#       end
+
+#       # 
+#       # Get the PG connection.
+#       # 
+#       def pg_conn
+#         if host_value
+#           conn = PG.connect(
+#             host_value, 5432, '', '', 
+#             db_value, 
+#             user_value, 
+#             passwd_value )
+#         else
+#           conn = PG.connect( dbname: db_value )
+#         end
+#       end
+
+#     end
+#   end
+# end

data/lib/gloo/objs/dt/datetime.rb

@@ -97,11 +97,16 @@ module Gloo
         self.set_value( DtTools.sub( dt, modifier ) )
         @engine.heap.it.set_to self.value
       end
+
       #
       # Set the value to the beginning of the month.
       #
       def msg_begin_month
-        dt = DtTools.beginning_of_month( self.value.to_time )
+        # dt = DtTools.beginning_of_month( self.value.to_time )
+        dt = self.value.to_time.beginning_of_month
+        self.set_value dt
+        @engine.heap.it.set_to dt
+
         self.set_value dt
         @engine.heap.it.set_to dt
       end
@@ -110,7 +115,8 @@ module Gloo
       # Set the value to the end of the month.
       #
       def msg_end_month
-        dt = DtTools.end_of_month( self.value.to_time )
+        # dt = DtTools.end_of_month( self.value.to_time )
+        dt = self.value.to_time.end_of_month
         self.set_value dt
         @engine.heap.it.set_to dt
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gloo
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.3.0
 platform: ruby
 authors:
 - Eric Crane
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-05-15 00:00:00.000000000 Z
+date: 2025-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -294,20 +294,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.4
-- !ruby/object:Gem::Dependency
-  name: pg
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.5.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.5.4
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement