git-gitlab 0.3.0 → 0.3.5

data/bin/git-gitlab

@@ -8,7 +8,13 @@ require 'thor'
 # Gitlab Commandline interface
 #
 class GitGitlabCLI < Thor
-  @gitlab = GitlabKernel.new
+
+  attr_reader :gitlab
+
+  def initialize(args, opts, config)
+    @gitlab = GitlabKernel.new
+    super(args, opts, config)
+  end
 
   desc "merge SOURCE TARGET --assign ${ASSING}", "create mergerequest SOURCE to TARGET. assign to ${ASSING}"
   long_desc <<-LONGDESC
@@ -17,8 +23,13 @@ class GitGitlabCLI < Thor
   option :assign
   option :list, :type => :boolean
   option :l , :type => :boolean
-  def merge(source =nil, target = nil)
-    if options[:list] || options[:l]
+  def merge(source = nil, target = nil)
+    show_all = lambda { |source, target, options|
+      (source == nil && target == nil) ||
+      options[:l] ||
+      options[:list]
+    }
+    if show_all.call(source, target, options)
       mergerequests = @gitlab.mergerequests
       result = mergerequests.map { |m| "\##{m.iid}, #{m.title}" }.join("\n")
       puts(result)

data/lib/git/gitlab/version.rb

@@ -1,5 +1,5 @@
 module Git
   module Gitlab
-    VERSION = "0.3.0"
+    VERSION = "0.3.5"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-gitlab
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-23 00:00:00.000000000 Z
+date: 2014-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler