handy 0.0.28 → 0.0.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b033fc8c059b880793277ad5ac18228acd29d5c
-  data.tar.gz: ffa5da5c39742ac341a5a740b08b9d86db4edca7
+  metadata.gz: dd372766b424ef623504c187c3628f3f0b1ae725
+  data.tar.gz: 1794c1f1f19fbd8bcc684b896870d2ec60575afb
 SHA512:
-  metadata.gz: 123eee508942d41d59a0e55d5ac6aca19c0e54770f0667c9b99be0e71cf11816a123ee53215a65e2fb09df997d689415332f25a33fe25fa8207529013ec44165
-  data.tar.gz: c51ed6aaf6f22c808c809aa563f402074690ca69184df914c6427f214e61e10d212837fd879b3b9b20b99b97e78c969da1d7fd7160aa6262487333ca031b1f90
+  metadata.gz: 4892ef1631b4c63fb9368acd0411bebbc689d2ca6584c1ea8e81cad9434becd3e7157eca49c6a7e7b2e47e3ad6108df1700dbf7f3f5fed19cbde2dd4bfffe005
+  data.tar.gz: a73d3119208931698a29b35c26c484cdd54c1da8e776e33f60036e5521b7ecc1e5605f019d241f1dfb63559b9525422fcacaec59b1fdd5249d21485c1443cc87

data/lib/handy/config_loader.rb

@@ -1,3 +1,6 @@
+#This file is needed copy production db to localhost. This file
+#is used to get database name.
+
 require "hashr"
 
 module Handy

data/lib/handy/engine.rb

@@ -1,10 +1,6 @@
 module Handy
   class Engine < ::Rails::Engine
 
-    initializer :load_application_yml, before: :load_environment_config do
-      ::Settings = ConfigLoader.new('settings.yml').load
-    end
-
     rake_tasks do
       load 'handy/trailing_whitespaces.rb'
       load 'handy/delete_merged_branches.rb'

data/lib/handy/heroku_tasks.rb

@@ -5,9 +5,15 @@ end
 
 namespace :handy do
 
-  desc "delete merged branches"
-  task :delete_merged_branches do
+  desc "delete merged branches from github"
+  task :delete_merged_branches_from_github do
+
+    puts "This command deletes branches from github."
+    puts "This command would never delete master, staging or production branch."
+    puts "This command only deletes branches which are already merged."
     cmd = "git branch -r --merged | grep -v master | grep -v staging | grep -v production | sed -e 's/origin\//:/' | xargs git push origin"
+    puts cmd
+
     `#{cmd}`
   end
 
@@ -18,17 +24,17 @@ namespace :handy do
       take_current_snapshot "#{heroku_app_name(t, args)}-production"
     end
 
-    desc "Takes snapshot of production db and copies production data to development"
+    desc "Take snapshot of production db and copy production data to development"
     task :prod2development, :app do |t, args|
       export2local "#{heroku_app_name(t, args)}-production"
     end
 
-    desc "Takes snapshot of staging db and copies staging data to development"
+    desc "Take snapshot of staging db and copy staging data to development"
     task :staging2development, :app do |t, args|
       export2local "#{heroku_app_name(t, args)}-staging"
     end
 
-    desc "Takes snapshot of production db and copies production data to staging"
+    desc "Take snapshot of production db and copy production data to staging"
     task :prod2staging, :app do |t, args|
       take_current_snapshot "#{heroku_app_name(t, args)}-production"
 
@@ -40,7 +46,7 @@ namespace :handy do
       execute "heroku pgbackups:restore DATABASE #{get_src_db_url_cmd} --app #{dst_app_name} --confirm #{dst_app_name}"
     end
 
-    desc "Takes snapshot of branch A and pushes to branch B"
+    desc "Take snapshot of branch A and copy data to branch B"
     task :a2b, :app do |t, args|
       a = ENV['A'] || ENV['a']
       b = ENV['B'] || ENV['b']
@@ -71,8 +77,8 @@ namespace :handy do
 
     def export2local(app_name)
       take_current_snapshot(app_name)
-      execute "curl -o latest.dump `heroku pgbackups:url --app #{app_name}`"
-      execute restore_command + "; rm latest.dump" 
+      execute "curl -o latest.dump `heroku pg:backups public-url --app #{app_name}`"
+      execute restore_command + "; rm latest.dump"
     end
 
     def take_current_snapshot(app_name)
@@ -91,17 +97,20 @@ ERROR_MSG
       database_config && database_config[:database] ||
           abort('Error: Please check your database.yml since no database was found.')
     end
-    
+
     def database_config
       @database_config ||= Handy::ConfigLoader.new('database.yml').load
     end
-    
+
     def restore_command
+      host = database_config[:host]
+
+      #Posgresql.app sets user as machine user. In mac command "id -un" gets user name
+      username = `id -un`.chomp
+
       result = "pg_restore --verbose --clean --no-acl --no-owner"
-      result += " -h#{database_config[:host]}" if database_config[:host].present?
-      result += " -U#{database_config[:username]}" if database_config[:username].present?
-      result = "PGPASSWORD=#{database_config[:password]} #{result}" if database_config[:password].present?
-      
+      result += " -h#{host}"
+      result += " -U#{username}"
       result + " -d #{local_database} latest.dump"
     end
   end

data/lib/handy/version.rb

@@ -1,3 +1,3 @@
 module Handy
-  VERSION = "0.0.28"
+  VERSION = "0.0.29"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: handy
 version: !ruby/object:Gem::Version
-  version: 0.0.28
+  version: 0.0.29
 platform: ruby
 authors:
 - Neeraj Singh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-08 00:00:00.000000000 Z
+date: 2015-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashr
@@ -39,7 +39,6 @@ files:
 - handy.gemspec
 - lib/handy.rb
 - lib/handy/add_database_yml.rb
-- lib/handy/additional_test_directories.rb
 - lib/handy/config_loader.rb
 - lib/handy/delete_heroku_apps.rb
 - lib/handy/delete_merged_branches.rb
@@ -66,7 +65,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Collection of handy tools

data/lib/handy/additional_test_directories.rb

@@ -1,25 +0,0 @@
-# Adding test/services directory to the rake test.
-namespace :test do
-  desc "Test services code"
-  Rails::TestTask.new(services: 'test:prepare') do |t|
-    t.pattern = 'test/services/**/*_test.rb'
-  end
-end
-
-# Adding test/workers directory to the rake test.
-namespace :test do
-  desc "Test workers code"
-  Rails::TestTask.new(workers: 'test:prepare') do |t|
-    t.pattern = 'test/workers/**/*_test.rb'
-  end
-end
-
-# Adding test/carriers directory to the rake test.
-namespace :test do
-  desc "Test carriers code"
-  Rails::TestTask.new(carriers: 'test:prepare') do |t|
-    t.pattern = 'test/carriers/**/*_test.rb'
-  end
-end
-
-Rake::Task['test:run'].enhance ["test:services", "test:carriers", "test:workers"]