capistrano-craft 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4b39c1f2e7079239d641d0901b6d96987e1476dc
-  data.tar.gz: 43ab2d884852edda936c18db39a15ac723e097e3
+SHA256:
+  metadata.gz: fceeba041e1f430d60d18f014f8f5f17688a0bed40e0c162286ecd76a5b56b84
+  data.tar.gz: 0fc17f5c3ff63a0199cdaf5d44834824397fe19a128478aea2e93484fe4c2be5
 SHA512:
-  metadata.gz: 6ee4649ff1d73b28364b369ca1a78b93eed8af5dee426befe1cfc574b48065d08915fb93ec2018e03045b2f7e1526376934acfaf5fb5b7d85998a52fc9f9c6cb
-  data.tar.gz: a8c6e723374e2bf626d4f3c14c4aa43d4848625b904be564210488f49a627184e818c8bf6b53fdb8691cba493e77becfa5763f40c7cc52310cdcdd2c0123f6b6
+  metadata.gz: a3046e543a9900d4476eba382e240df0a95a725ccce70432685f7fae494f2fe459666863599c719dcbba65f898a54b9ea909967fd82024d041eee3c4519d43d9
+  data.tar.gz: 501bf426899abe035c403c1e69d35a00715e3f574211a74ca155ddb1cdfe92c90c0a96178448bc9d411758421c6a72b18f89c71d194e3a80789654c6e71a654f

data/.rspec

@@ -0,0 +1 @@
+--require spec_helper

data/Gemfile

@@ -2,3 +2,5 @@ source "https://rubygems.org"
 
 # Specify your gem's dependencies in capitrano-craft.gemspec
 gemspec
+
+gem "rspec"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    capistrano-craft (0.1.4)
+    capistrano-craft (0.2.0)
       capistrano (~> 3.1)
       capistrano-composer (~> 0.0.6)
 
@@ -10,7 +10,7 @@ GEM
   specs:
     airbrussh (1.4.0)
       sshkit (>= 1.6.1, != 1.7.0)
-    capistrano (3.11.2)
+    capistrano (3.12.0)
       airbrussh (>= 1.0.0)
       i18n
       rake (>= 10.0.0)
@@ -18,12 +18,26 @@ GEM
     capistrano-composer (0.0.6)
       capistrano (>= 3.0.0.pre)
     concurrent-ruby (1.1.5)
-    i18n (1.7.0)
+    diff-lcs (1.3)
+    i18n (1.8.2)
       concurrent-ruby (~> 1.0)
     net-scp (2.0.0)
       net-ssh (>= 2.6.5, < 6.0.0)
     net-ssh (5.2.0)
-    rake (13.0.0)
+    rake (13.0.1)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.1)
+      rspec-support (~> 3.9.1)
+    rspec-expectations (3.9.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.2)
     sshkit (1.20.0)
       net-scp (>= 1.1.2)
       net-ssh (>= 2.8.0)
@@ -33,6 +47,7 @@ PLATFORMS
 
 DEPENDENCIES
   capistrano-craft!
+  rspec
 
 BUNDLED WITH
    2.0.2

data/lib/capistrano/craft/defaults.rb

@@ -17,7 +17,8 @@ set :craft_local_backups, "backups"
 set :craft_remote_backups, "shared/backups"
 
 # assets
-set :craft_compile_assets, "production"
+set :craft_compile_assets, true
+set :craft_compile_assets_command, "yarn install && yarn run production"
 
 # console
 set :craft_console_path, -> { "craft" }

data/lib/capistrano/craft/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Craft
-    VERSION = "0.1.4"
+    VERSION = "0.2.0"
   end
 end

data/lib/capistrano/dsl/craft.rb

@@ -47,55 +47,88 @@ module Capistrano
         File.join(fetch(:craft_local_backups), "#{backup_date.join('-')}_#{backup_time.join('-')}.sql")
       end
 
-      def postgres_dump(env, output)
+      def postgres_dump(env, config, output)
         execute SSHKit::Command.new <<-EOCOMMAND
           source "#{env}"
-          PGPASSWORD=$DB_PASSWORD pg_dump -U $DB_USER -h $DB_SERVER -p $DB_PORT -F p --no-owner $DB_DATABASE > #{output}
+          PGPASSWORD=$DB_PASSWORD pg_dump -U $DB_USER -h #{config[:host]} -p #{config[:port]} -F p --no-owner #{config[:database]} > #{output}
         EOCOMMAND
       end
 
       def mysql_dump(env, output)
       end
 
-      def postgres_restore(env, input)
+      def postgres_restore(env, config, input)
         execute SSHKit::Command.new <<-EOCOMMAND
           source "#{env}"
-          PGPASSWORD=$DB_PASSWORD dropdb -U $DB_USER -h $DB_SERVER -p $DB_PORT $DB_DATABASE
-          PGPASSWORD=$DB_PASSWORD createdb -U $DB_USER -h $DB_SERVER -p $DB_PORT $DB_DATABASE
-          PGPASSWORD=$DB_PASSWORD psql -U $DB_USER -d $DB_DATABASE -h $DB_SERVER -p $DB_PORT -q < "#{input}"
+          PGPASSWORD=$DB_PASSWORD dropdb -U $DB_USER -h #{config[:host]} -p #{config[:port]} #{config[:database]}
+          PGPASSWORD=$DB_PASSWORD createdb -U $DB_USER -h #{config[:host]} -p #{config[:port]} #{config[:database]}
+          PGPASSWORD=$DB_PASSWORD psql -U $DB_USER -d #{config[:database]} -h #{config[:host]} -p #{config[:port]} -q < "#{input}"
         EOCOMMAND
       end
 
       def mysql_restore(env, input)
       end
 
-      def craft_database(env)
-        driver = capture SSHKit::Command.new <<-EOCOMMAND
+      def database_config(env)
+        config = capture SSHKit::Command.new <<-EOCOMMAND
           source "#{env}"
-          echo $DB_DRIVER
+          echo "$DB_DSN,$DB_DRIVER,$DB_SERVER,$DB_PORT,$DB_DATABASE"
         EOCOMMAND
 
-        case driver.strip
-        when "pgsql" then return :pgsql
-        when "mysql" then return :mysql
+        params = config.split(",")
+        parsed = {}
+
+        if params[0].length > 0
+          # Using the newer style DB_DSN config style
+          dsn = params[0].split(":")
+
+          # Split in config chunks eg. host=<host>
+          database = dsn[1].split(";").map { |str|
+            tuple = str.split("=")
+            [tuple[0], tuple[1]]
+          }.to_h
+
+          parsed = {
+            driver: dsn[0],
+            host: database["host"],
+            port: database["port"],
+            database: database["dbname"]
+          }
         else
-          raise "Unable to determine database driver: \"#{driver.strip}\""
+          # Using the older style config style
+          parsed = {
+            driver: params[1],
+            host: params[2],
+            port: params[3],
+            database: params[4]
+          }
         end
+
+        case parsed[:driver].strip
+        when "pgsql" then parsed[:driver] = :pgsql
+        when "mysql" then parsed[:driver] = :mysql
+        else
+          raise "Unable to determine database driver: \"#{parsed[:driver].strip}\""
+        end
+
+        return parsed
       end
 
       def database_dump(env, input)
-        if craft_database(env) == :pgsql
-          postgres_dump(env, input)
+        config = database_config(env)
+        if config[:driver] == :pgsql
+          postgres_dump(env, config, input)
         else
-          mysql_dump(env, input)
+          mysql_dump(env, config, input)
         end
       end
 
       def database_restore(env, input)
-        if craft_database(env) == :pgsql
-          postgres_restore(env, input)
+        config = database_config(env)
+        if config[:driver] == :pgsql
+          postgres_restore(env, config, input)
         else
-          mysql_restore(env, input)
+          mysql_restore(env, config, input)
         end
       end
     end

data/lib/capistrano/tasks/deploy.rake

@@ -5,10 +5,11 @@ namespace :deploy do
 
   desc 'Compile assets'
   task :compile_assets do
-    on release_roles(fetch(:craft_deploy_roles)) do
-      within release_path do
-        execute :yarn, "install"
-        execute :yarn, "run", fetch(:craft_compile_assets)
+    if fetch(:craft_compile_assets)
+      on release_roles(fetch(:craft_deploy_roles)) do
+        within release_path do
+          execute fetch(:craft_compile_assets_command)
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-craft
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Chris Dyer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-13 00:00:00.000000000 Z
+date: 2020-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -46,6 +46,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock
@@ -82,8 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Capistrano Craft - Easy deployment of Symfony 4 apps with Ruby over SSH