RubyApp 0.5.94 → 0.5.95

data/.gitignore

@@ -8,5 +8,6 @@ lib/ruby_app/elements/mobile/documents/authentication/open_id/associations
 lib/ruby_app/elements/mobile/documents/authentication/open_id/nonces
 lib/ruby_app/elements/mobile/documents/authentication/open_id/temp
 *.gem
+*.lock
 *.log
 *.pid

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    RubyApp (0.5.94)
+    RubyApp (0.5.95)
       BlueCloth
       chronic
       chronic_duration

data/Rakefile

@@ -19,10 +19,15 @@ namespace :ruby_app do
     system("git checkout development; git pull origin development; git log --pretty=format:'%H %s' production..HEAD")
   end
 
+  desc 'Push to development'
+  task :push do |task|
+      system('git checkout development; git pull origin development; git push origin development')
+  end
+
   desc 'Push to production, release, and increment version'
   task :release do |task|
-      system('git checkout development; git pull origin development; git push origin development; git checkout production; git pull origin production; git merge origin/development; git push origin production; rake release')
-      version_file = File.join(RubyApp::ROOT, %w[lib ruby_app version.rb])
+      system('git checkout production; git pull origin production; git merge origin/development; git push origin production; rake release; git checkout development')
+      version_file = File.join(RubyApp::ROOT, %w[version.rb])
       RubyApp::VERSION =~ /(\d+)\.(\d+)\.(\d+)/
       system("sed 's|[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*|#{$1}.#{$2}.#{$3.to_i + 1}|g' < '#{version_file}' > '#{version_file}.out'; rm '#{version_file}'; mv '#{version_file}.out' '#{version_file}'")
       system("git commit --all --message=\'Version #{RubyApp::VERSION}\'")

data/lib/ruby_app/version.rb

@@ -1,4 +1,4 @@
 module RubyApp
-  VERSION = "0.5.94"
+  VERSION = "0.5.95"
   ROOT    = File.expand_path(File.dirname(__FILE__))
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: RubyApp
 version: !ruby/object:Gem::Version 
-  hash: 183
+  hash: 181
   prerelease: 
   segments: 
   - 0
   - 5
-  - 94
-  version: 0.5.94
+  - 95
+  version: 0.5.95
 platform: ruby
 authors: 
 - Frank G. Ficnar