heroku_cli 0.1.2 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6478a119a07ee608a0a8f98d2dcff91934351c4f
-  data.tar.gz: fc4f72070758af5f4a4e7bd33ae897b07f2ff79e
+SHA256:
+  metadata.gz: 7bde86920489f39c39bf2d00cb92374e1bf0de429952a1bb39ebbdd182324def
+  data.tar.gz: c78e49f1c81ecb0f356e9881d08705b652e8bac28807b07c1af41a588cafe525
 SHA512:
-  metadata.gz: b847dc310a70fa29076edf867f2564823c6c967b04401e190b20f5b1b2d501085eb243cccd84b216472f35bd502c6371694eb22c8701aa83370f6f02ad10d3ed
-  data.tar.gz: 21e3b53a26d763264b238439871275ea163bc0307d5234a81a1afa940abcf0afd07c688bf7d0c70fd71070fe284c4f6b09c1e97a2f939535b4a90a427f3e3228
+  metadata.gz: a7a3f2180402966a71e43b24beaf125818f047bfef705d81066091df89ea591239cbbc84c52376c4e2feb26cd10686d4d62cce722a73a88dfa377c99374925d2
+  data.tar.gz: 0f3607f47744594c9bd6ce33b554d9f9ddc979d65efb72bf6866061b6256e70a9a9a1a7a57c7e0889fc53dabb38bf0e0f79eae5a12cb8ee516b0b3e23868fd2d

data/.github/workflows/ruby.yml

@@ -0,0 +1,20 @@
+name: Ruby
+
+on: [push]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby 3.2
+      uses: actions/setup-ruby@v1
+      with:
+        ruby-version: 3.2.x
+    - name: Build and test with Rake
+      run: |
+        gem install bundler
+        bundle install --jobs 4 --retry 3
+        bundle exec rake

data/.ruby-version

@@ -0,0 +1 @@
+3.2.4

data/README.md

@@ -1,3 +1,5 @@
+![Ruby](https://github.com/Flightlogger/heroku_cli/workflows/Ruby/badge.svg)
+
 # HerokuCLI
 
 This gem will wrap the Heroku CLI so it may be used in ruby code
@@ -31,7 +33,7 @@ staging = HerokuCLI.application('staging')
 staging.pg.create_follower(production_db)
 staging.pg.wait
 new_db = staging.pg.followers.first
-staging.promote(new_db)
+staging.pg.promote(new_db, wait: true)
 ```
 
 ## Development

data/heroku_cli.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["rasmus.bergholdt@gmail.com"]
 
   spec.summary       = %q{A tiny wrapper for Heroku CLI}
-  spec.description   = %q{Wrap the Heroku CLI to make it more accessable from your ruby script}
+  spec.description   = %q{Wrap the Heroku CLI to make it more accessible from your ruby script}
   spec.homepage      = "https://github.com/Flightlogger/heroku_cli"
   spec.license       = "MIT"
 
@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.15"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler", "~> 2.0"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
 end

data/lib/heroku_cli/base.rb

@@ -6,10 +6,14 @@ module HerokuCLI
       @application = application.is_a?(String) ? Application.new(application) : application
     end
 
-    protected
-
-    def heroku(cmd)
-      %x{ heroku #{cmd} -a #{application.name} }
+    def heroku(cmd, args=nil)
+      if !args || args.strip.empty?
+        puts "heroku #{cmd} -a #{application.name}"
+        %x{ heroku #{cmd} -a #{application.name} }
+      else
+        puts "heroku #{cmd} -a #{application.name} -- #{args}"
+        %x{ heroku #{cmd} -a #{application.name} -- #{args} }
+      end
     end
   end
 end

data/lib/heroku_cli/pg/database.rb

@@ -2,17 +2,16 @@ module HerokuCLI
   class PG < Base
     class Database
       attr_reader :url_names, :info
+      attr_reader :pg
+
+      def initialize(info, pg = nil)
+        @pg = pg
+        parse_info(info)
 
-      def initialize(info)
-        @url_names = info.shift
-        @url_names = @url_names.sub('=== ','').split(',').map(&:strip)
-        @info = {}
-        info.each do |line|
-          k = line.split(':')[0].strip
-          v = line.split(':')[1..-1].join(':').strip
-          next if k.nil? || v.nil?
-          @info[k] = v
-        end
+      end
+
+      def reload
+        parse_info(pg.heroku("pg:info #{url_name}")) if pg.present?
       end
 
       def url_name
@@ -21,6 +20,7 @@ module HerokuCLI
 
       def to_s
         result = ["=== #{@url_names.join(', ')}"]
+        result.concat([''])
         result.concat(info.map { |k, v| format("%-22.22s %s", "#{k}:", v)})
         result.concat([''])
         result.join("\n")
@@ -55,11 +55,11 @@ module HerokuCLI
       end
 
       def forks
-        info['Forks'].split(',').map(&:strip)
+        info['Forks']&.split(',')&.map(&:strip)
       end
 
       def forked_from
-        info['Forked From'].split(',').map(&:strip)
+        info['Forked From']&.split(',')&.map(&:strip)
       end
 
       def following
@@ -71,7 +71,7 @@ module HerokuCLI
       end
 
       def fork?
-        info.key?('Forks')
+        !(main? || follower?) && forked_from&.any?
       end
 
       def follower?
@@ -93,6 +93,22 @@ module HerokuCLI
       def resource_name
         info['Add-on']
       end
+
+      def parse_info(info)
+        info = info.split("\n") if info.is_a?(String)
+        @url_names = info.shift
+        @url_names = @url_names.sub('=== ','').split(',').map(&:strip)
+        @info = {}
+        info.each do |line|
+          next if line.strip.empty?
+
+          k = line.split(':')[0]&.strip
+          v = line.split(':')[1..-1]&.join(':')&.strip
+          next if k.nil? || v.nil?
+
+          @info[k] = v
+        end
+      end
     end
   end
 end

data/lib/heroku_cli/pg.rb

@@ -10,33 +10,40 @@ module HerokuCLI
           next if stdout.nil? || stdout.length.zero?
           stdout = stdout.split("\n")
           stdout[0] = "===#{stdout[0]}"
-          Database.new(stdout)
+          Database.new(stdout, self)
         end
       end
     end
 
+    def reload
+      @info = nil
+    end
+
     # create a follower database
     def create_follower(database, options = {})
       plan = options.delete(:plan) || database.plan
-      heroku "addons:create heroku-postgresql:#{plan} --follow #{database.resource_name}"
+      heroku "addons:create heroku-postgresql:#{plan}", "--follow #{database.resource_name}"
     end
 
     # Remove the following of a database and put DB into write mode
-    def un_follow(database)
+    def un_follow(database, wait: false)
       raise "Not a following database #{database.name}" unless database.follower?
-      heroku "pg:unfollow #{database.url_name} -c #{application.name}"
+
+      heroku "pg:unfollow #{database.url_name}", "-c #{application.name}"
+      wait_for_follow_fork_transformation(database) if wait
     end
 
     # sets DATABASE as your DATABASE_URL
-    def promote(database)
+    def promote(database, wait: false)
       raise "Database already main #{database.name}" if database.main?
-      un_follow(database) if database.follower?
+
+      un_follow(database, wait: wait) if database.follower?
       heroku "pg:promote #{database.resource_name}"
     end
 
     def destroy(database)
       raise "Cannot destroy #{application.name} main database" if database.main?
-      heroku "addons:destroy #{database.url_name} -c #{application.name}"
+      heroku "addons:destroy #{database.url_name}", "-c #{application.name}"
     end
 
     # Return the main database
@@ -58,5 +65,14 @@ module HerokuCLI
     def wait
       heroku 'pg:wait'
     end
+
+    def wait_for_follow_fork_transformation(database)
+      while database.follower? do
+        puts "...wait 10 seconds for DB to change from follower to fork"
+        sleep 10
+        database.reload
+        puts database
+      end
+    end
   end
 end

data/lib/heroku_cli/version.rb

@@ -1,3 +1,3 @@
 module HerokuCLI
-  VERSION = "0.1.2"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: heroku_cli
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.1
 platform: ruby
 authors:
 - Rasmus Bergholdt
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2018-05-17 00:00:00.000000000 Z
+date: 2024-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -52,15 +52,17 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-description: Wrap the Heroku CLI to make it more accessable from your ruby script
+description: Wrap the Heroku CLI to make it more accessible from your ruby script
 email:
 - rasmus.bergholdt@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
+- ".ruby-version"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -82,7 +84,7 @@ homepage: https://github.com/Flightlogger/heroku_cli
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -97,10 +99,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.12
-signing_key: 
+rubygems_version: 3.4.19
+signing_key:
 specification_version: 4
 summary: A tiny wrapper for Heroku CLI
 test_files: []
-has_rdoc: