sqldef 0.2.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d1306970d19de4a138c573711a948f70ff3b90c5aff50be02a0ab0babcb5903
-  data.tar.gz: b2653d1ecf2b9005b214e9b9a7e76155b847f1c8a3cb605cc73bbd4b4ac1f4cc
+  metadata.gz: ddfef886cc9f1cb82ea3d734ca36b31e73b2138f9b523a317320ad5ffc533dcd
+  data.tar.gz: ac9aecdf26e546fd917f76b30a8b6cd8113a1208f6f4e42e9dade39b84c963bd
 SHA512:
-  metadata.gz: 93cb5fd9636bcc4156297aea7265efed384e322a68c3dcaa26b0446b87aaede905a4434b6297a2424e7cd96df960442619f863795ac61bbec969426d14f81768
-  data.tar.gz: 01efd0471ff53194afd2dbb95c69e284a02277f6a8986ca6ab71529808e293e5a8064641fe0799d1d27bd4ec0011cb72022d2d357fc671adaf90f60eaed86a45
+  metadata.gz: f0c3a4b41f1e34997d6ffbe306dfffb89584acad127b3ee6cd34d77f2cc76fc5e6bc44b2398d5c65ab333542eb5a05a8222dcaa348983b9f65b5aae316536829
+  data.tar.gz: 4eed1e00892ffc4a03049d60793f44283353a893a2a0c08ebe3671b83c26e36e5b7f67bbe235d1d922bce68967932392a21ac471984d0dfe99726ac093fbdcb9

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## v0.4.0
+
+- Follow redirects during downloading
+- Follow the repository move from k0kubun to sqldef
+- Add support for zip archive type for Windows and macOS
+
+## v0.3.0
+
+- Remove the `PGSSLMODE=disable` workaround of v0.2.x
+  - You should use psqldef v0.11.41 or newer
+
 ## v0.2.1
 
 - Fix a weird error message introduced at v0.2.0

data/lib/sqldef/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Sqldef
-  VERSION = '0.2.1'
+  VERSION = '0.4.0'
 end

data/lib/sqldef.rb

@@ -7,6 +7,7 @@ require 'rubygems/package'
 require 'stringio'
 require 'uri'
 require 'zlib'
+require 'zip'
 require_relative 'sqldef/version'
 
 module Sqldef
@@ -24,10 +25,12 @@ module Sqldef
   ]
   private_constant :COMMANDS
 
-  ENVS = {
-    'psqldef' => { 'PGSSLMODE' => 'disable' }, # TODO: support updating this
+  OS_ARCHIVE = {
+    'linux' => 'tar.gz',
+    'windows' => 'zip',
+    'darwin' => 'zip',
   }
-  private_constant :ENVS
+  private_constant :OS_ARCHIVE
 
   @bin = Dir.pwd
 
@@ -40,7 +43,7 @@ module Sqldef
       sqldef = download(command)
       schema = IO.popen(
         [
-          env(command), sqldef,
+          sqldef,
           "--user=#{user}", *(["--password=#{password}"] if password),
           "--host=#{host}", *(["--port=#{port}"] if port),
           '--export', database,
@@ -56,7 +59,7 @@ module Sqldef
     def dry_run(command:, path:, host:, port: nil, user:, password: nil, database:)
       sqldef = download(command)
       execute(
-        env(command), sqldef,
+        sqldef,
         "--user=#{user}", *(["--password=#{password}"] if password),
         "--host=#{host}", *(["--port=#{port}"] if port),
         '--dry-run', database,
@@ -69,7 +72,7 @@ module Sqldef
     def apply(command:, path:, host:, port: nil, user:, password: nil, database:)
       sqldef = download(command)
       execute(
-        env(command), sqldef,
+        sqldef,
         "--user=#{user}", *(["--password=#{password}"] if password),
         "--host=#{host}", *(["--port=#{port}"] if port),
         database,
@@ -84,16 +87,24 @@ module Sqldef
       return path if File.executable?(path)
 
       print("Downloading '#{command}' under '#{bin}'... ")
-      resp = get(build_url(command), code: 302) # Latest
-      resp = get(resp['location'],   code: 302) # vX.Y.Z
-      resp = get(resp['location'],   code: 200) # Binary
-
-      gzip = Zlib::GzipReader.new(StringIO.new(resp.body))
-      Gem::Package::TarReader.new(gzip) do |tar|
-        unless file = tar.find { |f| f.full_name == command }
-          raise "'#{command}' was not found in the archive"
+      url = build_url(command)
+      resp = get(url, code: 200, max_retries: 4)
+
+      if url.end_with?('.zip')
+        Zip::File.open_buffer(resp.body) do |zip|
+          unless entry = zip.find_entry(command)
+            raise "'#{command}' was not found in the archive"
+          end
+          File.binwrite(path, zip.read(entry))
+        end
+      else
+        gzip = Zlib::GzipReader.new(StringIO.new(resp.body))
+        Gem::Package::TarReader.new(gzip) do |tar|
+          unless file = tar.find { |f| f.full_name == command }
+            raise "'#{command}' was not found in the archive"
+          end
+          File.binwrite(path, file.read)
         end
-        File.binwrite(path, file.read)
       end
 
       FileUtils.chmod('+x', path)
@@ -109,29 +120,31 @@ module Sqldef
       end
     end
 
-    def env(command)
-      ENVS.fetch(command.to_s, {})
-    end
-
     def build_url(command)
       unless COMMANDS.include?(command)
         raise "Unexpected sqldef command: #{command}" 
       end
       os = Etc.uname.fetch(:sysname).downcase
-      arch = GOARCH.fetch(Etc.uname.fetch(:machine))
-      "https://github.com/k0kubun/sqldef/releases/latest/download/#{command}_#{os}_#{arch}.tar.gz"
+      archive = OS_ARCHIVE.fetch(os)
+      arch = Etc.uname.fetch(:machine)
+      goarch = GOARCH.fetch(arch, arch)
+      "https://github.com/sqldef/sqldef/releases/latest/download/#{command}_#{os}_#{goarch}.#{archive}"
     end
 
     # TODO: Retry transient errors
-    def get(url, code: nil)
+    def get(url, code: nil, max_retries:)
       uri = URI.parse(url)
-      Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == 'https') do |http|
+      resp = Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == 'https') do |http|
         http.get("#{uri.path}?#{uri.query}")
-      end.tap do |resp|
-        if code && resp.code != code.to_s
-          raise "Expected '#{url}' to return #{code}, but got #{resp.code}: #{resp.body}"
-        end
       end
+      if resp.is_a?(Net::HTTPRedirection) && max_retries > 0
+        # Follow redirects that lead to the current repository (if sqldef/sqldef is moved),
+        # Latest, vX.Y.Z, and to the binary
+        return get(resp['location'], code: code, max_retries: max_retries - 1)
+      elsif code && resp.code != code.to_s
+        raise "Expected '#{url}' to return #{code}, but got #{resp.code}: #{resp.body}"
+      end
+      resp
     end
   end
 end

data/sqldef.gemspec

@@ -17,6 +17,8 @@ Gem::Specification.new do |spec|
   spec.metadata['homepage_uri'] = spec.homepage
   spec.metadata['source_code_uri'] = spec.homepage
 
+  spec.add_runtime_dependency 'rubyzip'
+
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   spec.files = Dir.chdir(File.expand_path(__dir__)) do

metadata

@@ -1,15 +1,28 @@
 --- !ruby/object:Gem::Specification
 name: sqldef
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Takashi Kokubun
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-13 00:00:00.000000000 Z
-dependencies: []
+date: 1980-01-02 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rubyzip
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Idempotent MySQL/PostgreSQL schema management by SQL
 email:
 - takashikkbn@gmail.com
@@ -35,7 +48,6 @@ licenses:
 metadata:
   homepage_uri: https://github.com/sqldef/sqldef-ruby
   source_code_uri: https://github.com/sqldef/sqldef-ruby
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -50,8 +62,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Idempotent MySQL/PostgreSQL schema management by SQL
 test_files: []