glman 0.0.5 → 0.0.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OWQ5NWUzMzk5MTk5N2QyOWIwZGNkNGFjNDU1ZGMzYmFlMzk0YTVkYg==
+    MjNlOWU2MDk1ZDYyMzQ5MGNjYTlhMTIyN2M0ODZkYWE1MTcyYjFlNw==
   data.tar.gz: !binary |-
-    NTg0NDJlNzkwODBmMTM1ODM2ZDFmN2MyZWU1Njg3ZWQ5ZjBkYmEzNw==
+    ZTM2ZjRmNWM1NWQyOGZmYWZlMGUwMjIzMDU3NmVlODk2ZTkyYmViOA==
 SHA512:
   metadata.gz: !binary |-
-    YWVmZWU5NTUzNzdhODEyMWE0MmUyMmUzOTY3ODE5NGNjM2U4NjFmOWY1Mzdl
-    YjhjM2JmMzBjYTRlMjU3NGRiY2ZmZjJjYTEzZmE4MTM2ZjAzMjUxNTRmYTVh
-    ZGMwM2NlNjVkOTAyMjkyNTM2ZjgxODc2Y2NkZmRjYjI3NjM3MTg=
+    MmQ0MDhmOTdlMDQ0MWIwMTliYjA5YjE0YTA1ODAwNmMzZDJlOGJiNjQ1MTVl
+    NWZkYTVkNGI5OGVhZTc5Y2E4NmMzZjZiMTQ3N2IyZGE0Yzk5MmU5NGI3MmMx
+    N2I5ZDJjMjFiMWZjNDdiNDQyNWRhMWI0ZTg4NmE2ZmQ4MzRkOTY=
   data.tar.gz: !binary |-
-    YzZkMDY2YzQ5MmVkMDgzM2Y3MDFkZmUwNzlmZWMzMTBkOTQxNzg3MTFiZWM3
-    ZmE5Zjg5NjA1YmQ1YmE5MGI2ODlhYzkzOGE3MzE1YWI3ZjY0MmYwNGZhZjE4
-    MDFkMDJjZTAwZjhkZmU1NWE2ZDUxNTE5NDkxOGVlMzY2Y2FkNzk=
+    OWZmNDMzMzFhOTFlMTYyNzllZmRmZTFhNTdhMzA1OGJmNmNmOTM4YTA3ODhl
+    ZjAzMDE5ZmViNjNhZjc2NTE2YmU5NzQyYjk2OWE1MjI1OGUzYmQ4ZWMwMjAz
+    MWY1YzRhMzAzN2JhZGM2ZmRiMmYyMjY4ZDMzYTM4OWU1MWUzNTE=

data/README.md

@@ -44,9 +44,9 @@ make default: (make merge request from current branch to master with last commit
 
     $ glman mr <user_email_or_alias>
 
-make with git push origin current_branch
+make with git push <origin> current_branch
 
-    $ glman mr <user_email_or_alias> --push
+    $ glman mr <user_email_or_alias> --push <origin (default 'origin')>
 
 make full syntax
 

data/lib/glman/commands/base.rb

@@ -20,18 +20,14 @@ module Glman
 
         params = {assignee_id: user_id, title: message, source_branch: current_branch, target_branch: target_branch}
 
-        push_branch_first(current_branch) if push?
+        push_branch_first(origin, current_branch) unless origin.nil?
 
         projects_repo.create_merge_request(repository_name, params)
         ap params.merge({user_name: user_name, repository_name: repository_name})
       end
 
-      def push=(push)
-        @push = push
-      end
-
-      def push?
-        @push
+      def push=(origin=nil)
+        @origin = origin || 'origin'
       end
 
       def show=(bool)
@@ -61,7 +57,7 @@ module Glman
         if clear?
           configuration.clear_user_aliases
         else
-          configuration.add_user_alias(email: params[0], alias: params[1])
+          params.empty? ? show_aliases : configuration.add_user_alias(email: params[0], alias: params[1])
         end
         config
       end
@@ -99,14 +95,16 @@ module Glman
       end
 
       # Show help
-      def help?
-        puts 'help me :D'
+      def help!
+        puts 'Need help :D'
+        puts help_page
         exit
       end
-      alias :h? :help?
+      alias :h! :help!
 
       #Exec
       def call(name=nil, *params)
+        intro
         case name.to_s.strip
           when 'config' then config(params)
           when 'alias'  then user_alias(params)
@@ -117,8 +115,9 @@ module Glman
         end
       end
       private
+      attr_reader :origin
 
-      def push_branch_first(branch)
+      def push_branch_first(origin, branch)
         p "push branch: #{branch} to origin: origin"
         git_repo.push('origin', branch)
       end
@@ -146,6 +145,32 @@ module Glman
       def git_repo
         @git_repo ||= Repos::GitRepo.new
       end
+
+      def help_page
+        %{
+          commands:
+
+          config                                      # display current configuration
+          config <gitlab_url> <private_token> --init  # init configuration
+
+          alias                                       # display aliases
+          alias <user_email> <alias>                  # make alias for user email
+          alias --clear                               # clear all aliases
+
+          cache                                       # build user cache for better performance RECOMMENDED
+          cache --clear                               # clear user cache
+
+          mr <user_email_or_alias>                    # create merge request for user for current branch to master with title as last commit message
+
+          mr <user_email_or_alias> <message> <target_branch> --push <origin> # full options for merge request (default origin is a origin :D)
+
+          Any questions pniemczyk@o2.pl or go to https://github.com/pniemczyk/glman
+        }
+      end
+
+      def intro
+        puts "Glman ver: #{VERSION}"
+      end
     end
   end
 end

data/lib/glman/configuration.rb

@@ -13,6 +13,10 @@ module Glman
       File.write(config_file, config.to_yaml)
     end
 
+    def show_aliases
+      load[:aliases]
+    end
+
     def add_user_alias(opts={})
       config  = load
       aliases = config[:aliases] || {}

data/lib/glman/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glman
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Paweł Niemczyk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-17 00:00:00.000000000 Z
+date: 2014-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler