project_releaser 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f30d253fc85c95986faf137ae4dccd4de546fc4
-  data.tar.gz: d8dc32e00467b6710790f42ba6962f0f8eb5afec
+  metadata.gz: de9d1d21e70f467e26540f91e0f255b10685c402
+  data.tar.gz: 3f5a133c270756c2679d01de2fe40a91fdf6b383
 SHA512:
-  metadata.gz: adaee8550f6562864b3cc98617d4292bbb6c3d99c93418fdf5c4c0b1e36e31f4f9a325b2a49fcee24afd884202644837fb2da06f5572e7f7e9cebe288e12ed39
-  data.tar.gz: edf3aa85e3b00c1ce5347b998e62b3c57460e762179f422418551b575a2009d949ff95e1227d6aee245073e5d21168476777a81202a01775528cced98f66e165
+  metadata.gz: a0f58ad856370e553a4c488744843e144eca8f85af1a6482f564242c7ca9b54b5e72accd47e700d5d284289d4c29117e20926de5be60c6b93fe96d1b96caceb1
+  data.tar.gz: 1f89f0b9273f884e65267fa37cfc3c93d57350211ddc37020aaf50820fa0a9a1b2e46d40ad0a65b37e4473122473290b892c7a4723e3fb2e8ba9def1de0776d0

data/.rubocop.yml

@@ -0,0 +1,16 @@
+Documentation:
+    Enabled: false
+Metrics/LineLength:
+  Max: 120
+Metrics/MethodLength:
+  Max: 1000
+Metrics/ClassLength:
+  Max: 99999
+Style/SignalException:
+  AutoCorrect: false
+Style/SpecialGlobalVars:
+  AutoCorrect: false
+Lint/UnusedBlockArgument:
+  AutoCorrect: false
+Lint/UnusedMethodArgument:
+  AutoCorrect: false

data/.ruby-version

@@ -0,0 +1 @@
+ruby-2.2.4

data/README.md

@@ -1,10 +1,17 @@
 # Project Releaser
 
 CLI command to make releases of your semantic versioned project a breeze.
-It merges your development branch into release and tags with next `major`, `minor` or `patch` version.
+
+Running `project release` in the root of your project:
+* updates and `release` and `development` (if present) branches from all remotes
+* merges `development` branch with `release` (again, if `development` is present)
+* tags project with next `patch` version (which is the default one, `major` and `minor` are also available)
+* pushes both branches and tags to all remotes
+
+Please, refer to [Usage](#usage) section for more commands and examples.
 
 Currently branches are not configurable:
-* development is `staging`
+* development is `develop`
 * release is `master`
 
 ## Installation
@@ -17,7 +24,7 @@ And then execute:
 
     $ bundle install
 
-## Usage
+## <a name="usage"></a>Usage
   ```
   project [command]
 
@@ -28,8 +35,8 @@ Available commands:
 
   * `version`   Current production version of the project
   * `name`      Project name
-  * `update`    Updates master and staging branches from all reomtes
-  * `release`   Merges staging into master and pushes master with new version
+  * `update`    Updates master and develop branches from all reomtes
+  * `release`   Merges develop into master and pushes master with new version
 
 
 ### Release Command
@@ -45,4 +52,5 @@ project release 7.10.5
 ## TODO
 
 * Configurable branches
+* Notifications on release (i.e. to Slack)
 * Improve logs

data/lib/project_releaser.rb

@@ -1,5 +1,6 @@
 require 'git'
 require 'ostruct'
+require 'project_releaser/version'
 require 'project_releaser/logger/loggable'
 require 'project_releaser/logger/console'
 require 'project_releaser/logger/colored_console'

data/lib/project_releaser/project/releaser.rb

@@ -24,8 +24,8 @@ module ProjectReleaser
       end
 
       def merge_branches
-        logger.info "merging 'staging' into 'master'"
-        @git.merge :master, :staging 
+        logger.info "merging 'develop' into 'master'"
+        @git.merge :master, :develop
       end
 
       def push_release(version)
@@ -36,7 +36,7 @@ module ProjectReleaser
       def branches
         @branches ||=begin
           branches = [:master]
-          branches += [:staging] if @git.has_branch? :staging
+          branches += [:develop] if @git.has_branch? :develop
           branches
         end
       end

data/lib/project_releaser/project/updater.rb

@@ -10,7 +10,7 @@ module ProjectReleaser
       def update
         logger.info 'updating local release and develop branches'
         @git.returning_to_current_branch do |git|
-          git.pull [:master, :staging]
+          git.pull [:master, :develop]
         end
       end
     end

data/lib/project_releaser/version.rb

@@ -1,3 +1,3 @@
 module ProjectReleaser
-    VERSION = "0.0.1"
+    VERSION = "0.0.3"
 end

data/spec/project_releaser/project/releaser_spec.rb

@@ -10,16 +10,16 @@ describe ProjectReleaser::Project::Releaser do
   end
 
   it 'releases project with provided version name' do
-    allow(yielded_repository).to receive(:has_branch?).with(:staging).and_return(true)
-    expect(yielded_repository).to receive(:pull).with([:master, :staging]).ordered
-    expect(yielded_repository).to receive(:merge).with(:master, :staging).ordered
+    allow(yielded_repository).to receive(:has_branch?).with(:develop).and_return(true)
+    expect(yielded_repository).to receive(:pull).with([:master, :develop]).ordered
+    expect(yielded_repository).to receive(:merge).with(:master, :develop).ordered
     expect(yielded_repository).to receive(:push).with(:master, 'v2.3.5').ordered
 
     subject.release 'v2.3.5'
   end
 
   it 'doesnt pull and skips merging when there is no staging branch' do
-    allow(yielded_repository).to receive(:has_branch?).with(:staging).and_return(false)
+    allow(yielded_repository).to receive(:has_branch?).with(:develop).and_return(false)
     expect(yielded_repository).to receive(:pull).with([:master]).ordered
     expect(yielded_repository).not_to receive(:merge)
     expect(yielded_repository).to receive(:push).with(:master, 'v1.2.4').ordered

data/spec/project_releaser/project/updater_spec.rb

@@ -5,9 +5,9 @@ describe ProjectReleaser::Project::Updater do
   let(:yielded_repository) { double 'repository' }
   let(:subject) { ProjectReleaser::Project::Updater.new repository }
 
-  it 'updates master and staging branches from all remotes' do
+  it 'updates master and develop branches from all remotes' do
     allow(repository).to receive(:returning_to_current_branch).and_yield(yielded_repository)
-    expect(yielded_repository).to receive(:pull).with([:master, :staging])
+    expect(yielded_repository).to receive(:pull).with([:master, :develop])
 
     subject.update
   end

data/vagrant/ansible/app.yml

@@ -2,7 +2,7 @@
   sudo: yes
   vars:
     ruby_gemset: 'releaser'
-    rvm1_rubies: [ 'ruby-2.1.5' ]
+    rvm1_rubies: [ 'ruby-2.2.4' ]
     rvm1_gpg_key_server: 'pgp.uni-mainz.de'
     rvm1_rvm_check_for_updates: False
     app_home_path: /vagrant

data/vagrant/ansible/requirements.galaxy

@@ -1,7 +1,2 @@
 rvm_io.rvm1-ruby
-ANXS.mysql
-JasonGiedymin.nodejs
 kagux.dev_environment
-kagux.docker
-kagux.docker_compose
-DavidWittman.redis

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: project_releaser
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - kagux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-07 00:00:00.000000000 Z
+date: 2016-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -118,6 +118,8 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
+- ".ruby-version"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -145,7 +147,6 @@ files:
 - spec/project_releaser_spec.rb
 - spec/spec_helper.rb
 - todo
-- vagrant/.ruby-version
 - vagrant/ansible/app.yml
 - vagrant/ansible/inventory
 - vagrant/ansible/requirements.galaxy
@@ -170,7 +171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Make project release painless