shopapp 0.2.25 → 0.2.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '072874c8a7e91e6aeca35f8bb6063b3e1d456cb404ba6b485319e129e1672488'
-  data.tar.gz: 259a6604814c7a12c15a5879177aca5150570b62e8d56905eb85c55fb250668b
+  metadata.gz: 8e92fe09e9c1dd1a7085fdc8455b81d002cb5b5e4485fc3ba38aeab7bc8f28f9
+  data.tar.gz: 96a07f2b1b4673ce3c13994b0f8305f00e507fae864cf3c8e2ebced18cc0f445
 SHA512:
-  metadata.gz: c62b380297e2be67e1ee058d888e0887e7a1c60a23c5730e1f9b6e3c51bf0878d9c03c5c35216b8889af3e3ec28c443c4f4f9b06fa7a555d48e50e16c029793e
-  data.tar.gz: e4bfed6507bc70ccc5675706c4f0e1ead409d94d9d4d7f706f5813c1ce8348dddb3a7ed68c9ad3cbd2d3b22cdedc4a18e32e5ee94e17296ceb0734d971457489
+  metadata.gz: 309d469142c5142effed2d0c14a20c32d8f25787d5c31ae950bf10c44e62cd1285352c5c15a46eb707b1929de0007ed1717575a0ad055708a1754d007c84aaeb
+  data.tar.gz: 3c21c74c387a6534c5a8218c316ec5442439d99e2a5ccf8d58f6efc3d3087ca0010afd19f4ee90110b02fd62234dee39d63d036de2e6ebc231a7664694cb0b37

data/app/views/shopapp/_shopapp2.html.haml

@@ -36,7 +36,7 @@
               %span.material-icons.d-inline-block.text-muted.mr-1 search
               %form.w-100(action=search_path)
                 .form-group.mb-0
-                  %input.form-control{"aria-describedby" => "basic-addon1", "aria-label" => "Search", :placeholder => search_placeholder, :type => "search"}/
+                  %input.form-control{"aria-describedby" => "basic-addon1", "aria-label" => "Search",:name => "search", :placeholder => search_placeholder, :type => "search"}/
         .col-lg-4.px-lg-0.pt-lg-3.d-none.d-lg-flex.align-items-center.justify-content-end
           .dropdown
             %a#dropdownMenuButton.chip.chip-action.dropdown-toggle.mr-lg-4{"aria-expanded" => "false", "aria-haspopup" => "true", "data-toggle" => "dropdown", :href => "#"}

data/lib/shopapp/tasks/shopapp.rake

@@ -1,30 +1,40 @@
 namespace :shopapp do
+  def deployment_settings
+    target = ENV['target'] || 'production'
+    Rails.configuration.settings['deployment']['default'].to_h.merge(
+      Rails.configuration.settings['deployment'][target].to_h
+    )
+  end
+
   desc 'pull prod db to local dev'
   task pulldb: :environment do
     timestamp = Time.now.strftime('%Y%m%d%H%M%S')
-    user = Rails.configuration.settings['production_dbuser'] || Rails.configuration.settings['production_user']
-    server = Rails.configuration.settings['production_dbserver'] || Rails.configuration.settings['production_server']
+    user = deployment_settings['dbuser'] || deployment_settings['user']
+    server = deployment_settings['dbserver'] || deployment_settings['server']
     db_name = Rails.configuration.database_configuration['production']['database']
     dev_db_name = Rails.configuration.database_configuration['development']['database']
     dump_filename = "#{db_name}_#{timestamp}.dump"
 
     puts "Creating production db backup to #{dump_filename}..."
-    system "ssh #{user}@#{server} 'pg_dump -Fc -c #{db_name} > #{dump_filename}'"
+    host_flag = if deployment_settings['dbhost'].present?
+      "-h #{deployment_settings['dbhost']}"
+    end
+    system "ssh #{user}@#{server} 'pg_dump -Fc -c --no-owner #{host_flag} #{db_name} > #{dump_filename}'"
     mkdir_p Rails.root.join('tmp')
     puts "Copying to local..."
     system "scp #{user}@#{server}:#{dump_filename} #{Rails.root.join('tmp')}"
     puts "Restoring to local development database..."
-    system "pg_restore --verbose -c --dbname #{dev_db_name} #{Rails.root.join('tmp', dump_filename)}"
+    system "pg_restore --no-owner --verbose -c --dbname #{dev_db_name} #{Rails.root.join('tmp', dump_filename)}"
     puts 'Restored production database to local development.'
   end
 
   desc 'execute command on production server'
   task run: :environment do
     ARGV.each { |a| task a.to_sym do ; end }
-    user = Rails.configuration.settings['production_user']
-    server = Rails.configuration.settings['production_server']
+    user = deployment_settings['user']
+    server = deployment_settings['server']
 
-    deployment_folder_name = (Rails.configuration.settings['deployment_folder']) ||
+    deployment_folder_name = (deployment_settings['folder']) ||
                              "#{(Rails.configuration.settings['shopapp_name'] ||
                               Rails.application.class.parent_name).to_s.downcase.parameterize.underscore}/current"
 

data/shopapp.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'shopapp'
-  s.version     = '0.2.25'
-  s.date        = '2019-02-01'
+  s.version     = '0.2.26'
+  s.date        = '2019-02-25'
   s.summary     = 'Do a shoplift.'
   s.description = 'Ha! Art thou Bedlam? Dost thou thirst base Trojan, to have me fold up Parca\'s fatal web? Hence!\
                    I am qualmish at the smell of leek.'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopapp
 version: !ruby/object:Gem::Version
-  version: 0.2.25
+  version: 0.2.26
 platform: ruby
 authors:
 - Zeljko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-01 00:00:00.000000000 Z
+date: 2019-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties