zwr 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 398179725f92cb0c0ce5afc8f067bef68ed3d39d
-  data.tar.gz: d226f243e785a7f906c98f6f5f924a91121a08e8
+  metadata.gz: 5647a916fa9019f6e1b66b76faa2b0b630e84534
+  data.tar.gz: 2fef4a6528ab6d8aae2948d6d135fa2d3024aad6
 SHA512:
-  metadata.gz: 0f2fc81920c996f4a48f57cef4cac72280fba64c9d6d672aabcfe5d1bb959fa97f20a714b39c1cf3ba7e6ed49cc809da453bbf6f960adedec99cf648cf5b7911
-  data.tar.gz: b7266d2e3efe33c699b25be1f36f97d28e2e1e7f68607de869949d4ac5fd87cbcb71c4cdd8f02a3100d32672a804475ab62d604a0e5d592326b6fd764d56d768
+  metadata.gz: 779744f7ca42cc34d3c808a6b71b4faf92ec7312a46e4dfcaf535082d69421d291dc18afcce7bef127f01b39e077ec8e22d4099a7a349bf3d9cc487a07d42cdc
+  data.tar.gz: 2ad03b49b4f425b209a9c0fdb163b918aab4d513a9373393b2ab22d7d54fdf8bc6f74a6a672f27d481c1ec89912cb2f2e5a1fa2ee3112ea9046c2f0f7461a80c

data/bin/zwr

@@ -97,11 +97,9 @@ when 'deploy'
     puts "This script must be run as super user. Use sudo zwr deploy #{ARGV[2]}"
   else
     if File.directory? "/var/rails_apps/#{ARGV[1]}"
-      putsv "Updating existing #{ARGV[1]}"
-      Dir.chdir "/var/rails_apps/#{ARGV[1]}"
-      `cd /var/rails_apps/#{ARGV[1]} ; git fetch`
-      `cd /var/rails_apps/#{ARGV[1]} ; git checkout production`
-      `cd /var/rails_apps/#{ARGV[1]} ; git reset --hard origin/production`
+      puts "Project is already deployed, do the following:"
+      puts "cd /var/rails_apps/#{ARGV[1]}"
+      puts "rake zwr:production:update"
     else
       Dir.chdir "/var/rails_apps"
       putsv "Deploying new project #{ARGV[1]}"
@@ -130,8 +128,8 @@ when 'deploy'
       VHFILE
       `echo "#{virtual_host_file}" > /etc/httpd/virtual_hosts/#{ARGV[1]}.conf`
       `service httpd reload`
+      `touch /var/rails_apps/#{ARGV[1]}/tmp/restart.txt`
     end
-    `touch /var/rails_apps/#{ARGV[1]}/tmp/restart.txt`
   end
 else
   show_usage

data/lib/tasks/zwr.rake

@@ -13,6 +13,18 @@ namespace :zwr do
     `sed "s/# gem 'theruby/gem 'theruby/" -i Gemfile`
   end
 
+  namespace :production do
+    desc "updates production environment to latest production branch"
+    task :update do
+      `git fetch`
+      `git checkout production -q`
+      `git reset --hard origin/production`
+      `touch tmp/restart`
+      puts "now with the latest code from origin/production."
+      puts "server restarted."
+    end
+  end
+  
   desc "prepares production branch ready to roll"
   task :prepare do
     Dir.chdir Rails.root
@@ -43,6 +55,7 @@ namespace :zwr do
       `git commit -asm "precompiled resources"`
       `git push -u origin master`
       `git push -uf origin production`
+      `git checkout master`
     end
   end
 end

data/lib/zwr/app_template.rb

@@ -72,7 +72,7 @@ if use_devise
     inject_into_file  'app/models/user.rb', <<-FILE.strip_heredoc, before: "## Database authenticatable\n"
       ## ZWR generated fields
         field :name,               type: String, default: ""
-        field :admin,              type: Boolean, default: ""
+        field :admin,              type: Boolean, default: false
 
       FILE
     gsub_file  'app/models/user.rb', "## Database authenticatable", "  ## Database authenticatable"
@@ -83,7 +83,7 @@ if use_devise
     puts "       \033[35mfound\033[0m  #{filename}"
     inject_into_file(filename, <<-FILE, :after => "Database authenticatable\n")
       t.string   :name
-      t.boolean  :admin
+      t.boolean  :admin, default: false
     FILE
     gsub_file "test/test_helper.rb","fixtures :all", "include FactoryGirl::Syntax::Methods"
   end

data/zwr.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'zwr'
-  s.version     = '0.1.3'
+  s.version     = '0.1.4'
   s.date        = '2014-11-17'
   s.summary     = "All the Zwr needs"
   s.description = "A gem in which I jam what I commonly use."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zwr
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Zeljko