prun-ops 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c3bf9cea5466f0e1d186a7cf679fbc816a8f3ea
-  data.tar.gz: f647f477bbb903d56956f8e12cfb445038da6864
+  metadata.gz: d813fd5ecd7b3bd8039e2dce7ee9f8af9d70474a
+  data.tar.gz: de758f514650d117d78af443b60b6b87d5a5c7d3
 SHA512:
-  metadata.gz: 91f74c950501cddf800965b4d2f4a7e5904345cda37ca760f06ee6c06a4f28c89986fc946b305bb17a0d11e66d7ade9001e50094a5bf77ca19ba589ea73cf1f2
-  data.tar.gz: 0122a274194eda03e33e3c3de318916290977c4b096fdb93409277e2ce7a51c738acf4056c23700d2468318950f4a78aaeedd799e3fb73e1d45c2938121247fa
+  metadata.gz: c78728a231a775182de55f71b490cf02d49c51dfa9a59ff57723503f28136e8803ca7ebb03998e5be9569e8d6df1d9cdf2acf3245824531b02fa452169540829
+  data.tar.gz: aad2b5a1ebd2a41b6c608a4ab97153086ec2dd384b98375bb0feba2144b33a3199607e5d6f4a789a5d7ce85bc673607a2a6aa06c91a86910003433878d5e0e16

data/README.md

@@ -226,6 +226,8 @@ Release management
 
 ![Release management](https://docs.google.com/drawings/d/1IEWCIhDFqREVVjSwM9bPfVpyNm3jIoNF4Xn8y-dZHTg/pub?w=871&h=431  "Release management")
 
+* `rake git:ff` merge dev branch towards master branch without releasing
+
 ### Diagnosis
 
 Some capistrano commands useful to connect to server and help with the problem solving.
@@ -261,4 +263,9 @@ Some capistrano commands useful to connect to server and help with the problem s
 
 ### v0.0.5
 
-* Removing Application server version (thin 1.6.2) dependency
+* Removing Application server version (thin 1.6.2) dependency
+
+### v0.0.6
+
+* Fixing DigitalOcean images error when slug is nil for client images
+* Adding git:ff rake task

data/lib/prun-ops/commands/list.rb

@@ -18,7 +18,7 @@ command :list do |c|
 
     say "\nImages:"
     cli.images.all.each do |i|
-      say "   - #{i.slug.ljust(20)} =>   #{i.distribution} #{i.name}"
+      say "   - #{i.slug.ljust(20)} =>   #{i.distribution} #{i.name}" unless i.slug.nil?
     end
 
     say "\nSSH Keys:"

data/lib/prun-ops/version.rb

@@ -1,3 +1,3 @@
 module PrunOps
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/tasks/git.rake

@@ -0,0 +1,8 @@
+namespace :git do
+
+  desc "Merge dev forward master branch"
+  task :ff do
+    sh "git checkout master && git merge dev && git push && git checkout dev"
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prun-ops
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Juan Lebrijo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-11 00:00:00.000000000 Z
+date: 2014-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -131,6 +131,7 @@ files:
 - lib/prun-ops/version.rb
 - lib/tasks/backup.rake
 - lib/tasks/db.rake
+- lib/tasks/git.rake
 - lib/tasks/http.rake
 - lib/tasks/version.rake
 - prun-ops.gemspec