backhoe 0.6.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0da54b2284a8f477b20d0175cdb1023ffd28e03365598000e8cdf7403fb12dc4
-  data.tar.gz: a298c3b656be2bd65b52731ae749d27317b5bbd26e2401370a4ccbbfc22f73c1
+  metadata.gz: 100b63cead65cdff8255681cc6ea2e228efa706f48662dc08e0b594de8415dcc
+  data.tar.gz: d1abde4f85cbb93f40d94d7485184772d18d35669aa748fb27a529da43d2651f
 SHA512:
-  metadata.gz: 90cf47702daa8c845795bfba48175718016f3f929b34c3924d86ad3d51979ca91e2cfae4973d2839197ec333e8735c92b02347095256674f444998ec951118e8
-  data.tar.gz: 335c9e882afd7c4f8591f8b449b4cc1dc3205d74d7194a1112a0b2b9492af30223ebddad7c18583db96471ac2663e7b360eb569a40e8b9e91bd5ba6db4af32a2
+  metadata.gz: 3cb9ede3f8a8704611184842add89dd94755e53c2781c1aa8a0b529cb439bd2268bac4139beeac49fd6d10a7bae964e9496d44204de8de97ced4fd61b8d706b3
+  data.tar.gz: d8208ae606c0790f84adc8c501630ffc9bdf2be0775a6ec580a8c7dd788a06ebc4b6fa13fb043a5be71d32bbd7ed7bbb9dd68184d323c0af35b0431537d15160

data/.github/workflows/ci.yml

@@ -5,17 +5,24 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        gemfile: [ activerecord_6.0, activerecord_6.1, activerecord_7.0 ]
-        ruby: [ '3.0', 3.1, 3.2 ]
+        gemfile: [ activerecord_6.0, activerecord_6.1, activerecord_7.0, activerecord_7.1 ]
+        ruby: [ '3.0', 3.1, 3.2, 3.3 ]
 
     runs-on: ubuntu-20.04
     env: # $BUNDLE_GEMFILE must be set at the job level, so it is set for all steps
       BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
+      POSTGRES_HOST_AUTH_METHOD: trust
+
     steps:
       - name: Set up MySQL
         run: |
-          sudo /etc/init.d/mysql start
+          sudo service mysql start
           sudo mysql -uroot -proot -e"ALTER USER 'root'@'localhost' IDENTIFIED WITH caching_sha2_password BY '';"
+      - name: Set up PostgreSQL
+        run: |
+          sudo service postgresql start
+          sudo -u postgres createuser --superuser runner
+          createdb runner
       - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
         with:

data/Appraisals

@@ -10,3 +10,7 @@ appraise "activerecord-7.0" do
   gem "activerecord", "~>7.0.0"
 end
 
+appraise "activerecord-7.1" do
+  gem "activerecord", "~>7.1.0"
+end
+

data/README.md

@@ -17,8 +17,7 @@ Backhoe.load "data.sql.gz" # => can also load a gzipped sql file
 Backhoe.load "data.sql", drop_and_create: true # injects DROP and CREATE statements into the SQL invocation
 
 # Backup db to S3
-Backhoe.backup "bucket-name/folder" # => dumps db to e.g. s3://bucket-name/folder/2023-04-09T16:41:26Z.sql.gz via AWS CLI, assuming that credentials are already configured.
-Backhoe.backup "bucket-name/folder", access_key: "abc123", secret_key: "def456" # => manually specify AWS creds
+Backhoe.backup "bucket-name/folder", access_key: "abc123", secret_key: "def456" # => must specify AWS creds
 ```
 
 ## Development

data/backhoe.gemspec

@@ -27,6 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "appraisal"
   spec.add_development_dependency "mysql2"
+  spec.add_development_dependency "pg"
   spec.add_development_dependency "byebug"
   spec.add_development_dependency "timecop"
 end

data/gemfiles/activerecord_7.1.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~>7.1.0"
+
+gemspec path: "../"

data/lib/backhoe/backup.rb

@@ -1,16 +1,66 @@
+require "net/http"
+require "openssl"
+require "base64"
+
 module Backhoe
   class Backup < Struct.new(:s3_path, :access_key, :secret_key)
     def call
+      @time = Time.now
+
       Backhoe.dump path
-      Kernel.system "#{creds} aws s3 mv #{path} s3://#{s3_path}/#{filename}".strip
+
+      uri = URI("https://s3-us-west-2.amazonaws.com/#{s3_path}/#{filename}")
+
+      req = Net::HTTP::Put.new(uri, {
+        "Content-Length": File.size(path).to_s,
+        "Content-Type": content_type,
+        "Date": date,
+        "Authorization": "AWS #{access_key}:#{signature}",
+        "x-amz-storage-class": "STANDARD",
+        "x-amz-acl": "private",
+      })
+      req.body_stream = File.open(path)
+      Net::HTTP.start(uri.hostname) { |http| http.request(req) }
     end
 
     private
 
-    def creds
-      if access_key && secret_key
-        "AWS_ACCESS_KEY_ID=#{access_key} AWS_SECRET_ACCESS_KEY=#{secret_key}"
-      end
+    def signature
+      digester = OpenSSL::Digest::SHA1.new
+      digest = OpenSSL::HMAC.digest(digester, secret_key, key)
+      Base64.strict_encode64(digest)
+    end
+
+    def key
+      [
+        "PUT",
+        "",
+        content_type,
+        date,
+        acl,
+        storage_type,
+        full_s3_path,
+      ].join("\n")
+    end
+
+    def content_type
+      "application/gzip"
+    end
+
+    def date
+      @time.rfc2822
+    end
+
+    def acl
+      "x-amz-acl:private"
+    end
+
+    def storage_type
+      "x-amz-storage-class:STANDARD"
+    end
+
+    def full_s3_path
+      "/#{s3_path}/#{filename}"
     end
 
     def path
@@ -18,10 +68,7 @@ module Backhoe
     end
 
     def filename
-      @filename ||= begin
-        require "time"
-        "#{Time.now.utc.iso8601}.sql.gz"
-      end
+      "#{@time.utc.iso8601}.sql.gz"
     end
   end
 end

data/lib/backhoe/database.rb

@@ -26,6 +26,18 @@ module Backhoe
       config["database"]
     end
 
+    def adapter
+      config["adapter"]
+    end
+
+    def postgresql?
+      config["adapter"] == "postgresql"
+    end
+
+    def mysql?
+      %w[mysql2 trilogy].include?(config["adapter"])
+    end
+
     private
 
     def load_config

data/lib/backhoe/dump.rb

@@ -11,7 +11,11 @@ module Backhoe
     end
 
     def call
+      if skip_tables.any?
+        raise NotImplementedError if database.postgresql?
+      end
       if skip_columns.any?
+        raise NotImplementedError if database.postgresql?
         SanitizedDatabase.new(skip_columns, file_path).dump do |tables|
           self.skip_tables += tables
           dump
@@ -24,7 +28,13 @@ module Backhoe
     private
 
     def dump
-      sh "#{mysqldump} --no-create-db --single-transaction --quick -e #{skip_table_options} #{database.to_mysql_options} #{database.name} | #{pipe} > #{file_path}"
+      if database.mysql?
+        sh "#{mysqldump} --no-create-db --single-transaction --quick -e #{skip_table_options} #{database.to_mysql_options} #{database.name} | #{pipe} > #{file_path}"
+      elsif database.postgresql?
+        sh "#{pg_dump} --column-inserts #{database.name} | #{pipe} > #{file_path}"
+      else
+        raise "don't know how to dump #{database.adapter}"
+      end
     end
 
     private
@@ -35,6 +45,12 @@ module Backhoe
       cmd
     end
 
+    def pg_dump
+      cmd = `which pg_dump`.strip
+      raise RuntimeError, "Cannot find pg_dump." if cmd.blank?
+      cmd
+    end
+
     def pipe
       file_path =~ /\.gz$/ ? "gzip -9f" : "cat"
     end

data/lib/backhoe/load.rb

@@ -5,12 +5,19 @@ module Backhoe
     include Rake::DSL
 
     def call
-      sh command
+      case database.adapter
+      when "mysql2"
+        sh mysql_command
+      when "postgresql"
+        sh psql_command
+      else
+        raise "don't know how to load #{database.adapter}"
+      end
     end
 
     private
 
-    def command
+    def mysql_command
       cmd = "#{cat} #{file_path} | "
       cmd += if drop_and_create
         "#{pipe} | #{mysql} #{database.to_mysql_options}"
@@ -19,6 +26,15 @@ module Backhoe
       end
     end
 
+    def psql_command
+      cmd = "#{cat} #{file_path} | "
+      if drop_and_create
+        cmd = "dropdb -f #{database.name}; createdb #{database.name}; #{cmd}"
+      end
+      cmd += "#{psql} -P pager=off -q -d#{database.name}"
+      cmd
+    end
+
     def cat
       file_path =~ /\.gz$/ ? "zcat" : "cat"
     end
@@ -40,6 +56,12 @@ module Backhoe
       raise RuntimeError, "Cannot find mysql." if cmd.blank?
       cmd
     end
+
+    def psql
+      cmd = `which psql`.strip
+      raise RuntimeError, "Cannot find psql." if cmd.blank?
+      cmd
+    end
   end
 end
 

data/lib/backhoe/version.rb

@@ -1,3 +1,3 @@
 module Backhoe
-  VERSION = "0.6.1"
+  VERSION = "0.8.0"
 end

data/lib/backhoe.rb

@@ -15,7 +15,7 @@ module Backhoe
       Load.new(Database.new, file_path, drop_and_create).call
     end
 
-    def backup s3_path, access_key: nil, secret_key: nil
+    def backup s3_path, access_key:, secret_key:
       Backup.new(s3_path, access_key, secret_key).call
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: backhoe
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Micah Geisel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-04-09 00:00:00.000000000 Z
+date: 2024-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -130,6 +144,7 @@ files:
 - gemfiles/activerecord_6.0.gemfile
 - gemfiles/activerecord_6.1.gemfile
 - gemfiles/activerecord_7.0.gemfile
+- gemfiles/activerecord_7.1.gemfile
 - lib/backhoe.rb
 - lib/backhoe/backup.rb
 - lib/backhoe/database.rb
@@ -155,7 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.5.1
 signing_key: 
 specification_version: 4
 summary: Dump and load current database to and from a file.