RubyApp 0.5.93 → 0.5.94

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- RubyApp (0.5.93)
4
+ RubyApp (0.5.94)
5
5
  BlueCloth
6
6
  chronic
7
7
  chronic_duration
data/Rakefile CHANGED
@@ -14,10 +14,15 @@ namespace :ruby_app do
14
14
  puts RubyApp::VERSION
15
15
  end
16
16
 
17
- desc 'Push to master, release, and increment version'
17
+ desc 'Display commit difference between current branch and staging'
18
+ task :changes do |task|
19
+ system("git checkout development; git pull origin development; git log --pretty=format:'%H %s' production..HEAD")
20
+ end
21
+
22
+ desc 'Push to production, release, and increment version'
18
23
  task :release do |task|
19
- system('git push origin master && rake release')
20
- version_file = File.join(RubyApp::ROOT, %w[version.rb])
24
+ 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')
25
+ version_file = File.join(RubyApp::ROOT, %w[lib ruby_app version.rb])
21
26
  RubyApp::VERSION =~ /(\d+)\.(\d+)\.(\d+)/
22
27
  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}'")
23
28
  system("git commit --all --message=\'Version #{RubyApp::VERSION}\'")
@@ -1,4 +1,4 @@
1
1
  module RubyApp
2
- VERSION = "0.5.93"
2
+ VERSION = "0.5.94"
3
3
  ROOT = File.expand_path(File.dirname(__FILE__))
4
4
  end
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: RubyApp
3
3
  version: !ruby/object:Gem::Version
4
- hash: 177
4
+ hash: 183
5
5
  prerelease:
6
6
  segments:
7
7
  - 0
8
8
  - 5
9
- - 93
10
- version: 0.5.93
9
+ - 94
10
+ version: 0.5.94
11
11
  platform: ruby
12
12
  authors:
13
13
  - Frank G. Ficnar