glman 0.0.9 → 0.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjEzMDQ2MTEwMzQwZTFhNmEzODcwMjUwZTFiNzA5NDFkZjkzYTNlZg==
+    YWY3Zjg2ZWY3ZDI1ZWEwM2I5ZjdhYWNjZTUzOTBlYmIzMWU1MjNjNw==
   data.tar.gz: !binary |-
-    NTE4NTBiNjJlOWJiMGQwZjU3MTBlYTY1OGM2N2RlYzM5ZWQ0OWIwOA==
+    YjkyODhmYzJjODUxYWEzMWRlODRmYWM1OWY1ZGIxMjM4ZjdkODNiNg==
 SHA512:
   metadata.gz: !binary |-
-    ODVkMGM4MWQ1ZmUwMzU1YTFmZDNiNzhmNzU3NDk2ODk2NDVlYWM1NzNmYTEz
-    OGIzYjQ1ZWEyYmMzZWM4NTVlYTRjOTE0ZDU4OTE1YWZjNzBmY2RiZmNmNzMy
-    ZTM0MDNmYzc0NjkzNDY2YzVlNjFhZWEwOTYxMDU1ODVlNWNlNjE=
+    YzlmMmE1OWE0ODIwZjgzMmEzZWU5OWU5YzNjYjUxZGExNmViZGUyMGVlNWYx
+    ODYyOTVkZGJlYWEyMWNjMTYxY2Y3YjgyYmRkNzJiYTM1ZWVlYWVjOTY1MTMw
+    YTRjMmJiYjljYThkMWVkYjgzOThiODk2YWRlYTEyZjQ4MDcxMjk=
   data.tar.gz: !binary |-
-    OTk5NTUyZWYyODEzMWUyYTI1MGI1YjRmM2E4MjEwZjNkYjFjMzQ1MzM3Njc3
-    Y2JkNTliNzc4Y2NhYjhlYjBmZDcyNmMyNDdlMjMyMjhjYmUzODlmZDMxOWUx
-    MTBlYTMxMDI5Yjg0NzNiNDA2NjY4M2E1MjVmNDc4NGMzMTQxYmE=
+    OGJjM2U5ZDk5MWQ2ZjhhN2NkYmU1M2M5MmJhM2U0YTAzMjU0ZDhiY2JiMTBl
+    NTM2YzQzZWUyODQyOTRjY2U0Zjk0NTFlM2E4YmI3M2NkZTdjMzkyMjFhZTcw
+    ZDJhYTRiOTM2YmVkMzM4YTUyYjg2NmNmNDNjMmMzYjAzZGM1NWI=

data/README.md

@@ -12,7 +12,7 @@ GitLab bash manager
 
 setup
 
-    $ glman config <gitlab_url> <private_token> --init
+    $ glman config gitlab url:http://site private_token:123 --set
 
 show
 
@@ -20,23 +20,27 @@ show
 
 ### Aliases
 
-create 
+add
 
-    $ glman alias <user_email> <alias>
+    $ glman config aliases pn:pawel@o2.pl --add
+
+delete
+
+    $ glman config aliases pn --del
 
 clear all aliases
 
-    $ glman alias --clear
+    $ glman config aliases --clear
 
 ### User cache
 
 build cache
 
-    $ glman cache
+    $ glman cache_users
 
 clear cache
 
-    $ glman cache --clear
+    $ glman cache_users --clear
 
 ### Merge requests
 
@@ -52,9 +56,13 @@ make full syntax
 
     $ glman mr <user_email_or_alias> <message> <target_branch>
 
+make optional options (push repo, create mr and notify on irc)
+
+    $ glman mr <user_email_or_alias> --push --notify
+
 show merge requests
 
-    $ glman mr --show
+    $ glman mr
 
 
 ## Contributing

data/glman.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "rspec"
   spec.add_development_dependency "rake"
   spec.add_dependency "httpclient"
   spec.add_dependency "executable"
@@ -28,4 +29,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "active_support"
   spec.add_dependency "awesome_print"
   spec.add_dependency "hashie"
+  spec.add_dependency "irc-notify"
   end

data/lib/glman.rb

@@ -1,3 +1,4 @@
+require "glman/kernel"
 require "glman/version"
 require "active_support/dependencies"
 

data/lib/glman/commands/base.rb

@@ -10,137 +10,115 @@ module Glman
 
       # merge_request  user_name/email message target_branch
       def mr(params)
-        return show_all_mrs if show?
-        user_name       = params[0]
-        current_branch  = git_repo.current_branch
-
-        if current_branch == 'master'
-          p 'Merge request from master to master is not so good idea!'
-          return
-        end
-
-        target_branch   = params[2] || 'master'
-        user_id         = get_user_id(user_name)
-        message         = params[1] || git_repo.last_commit_message || current_branch
-        repository_name = git_repo.repository_name
-
-        params = {assignee_id: user_id, title: message, source_branch: current_branch, target_branch: target_branch}
+        return dp mr_command.get_all if params.length == 0
+        user_name      = params[0]
+        user_id        = get_user_id(user_name)
+        target_branch  = params[2] || 'master'
+        current_branch = git_repo.current_branch
+        msg            = params[1] || git_repo.last_commit_message || current_branch
 
         push_branch_first(origin, current_branch) unless origin.nil?
 
-        opts = projects_repo.create_merge_request(repository_name, params)
-        assignee = opts['assignee'] || {}
-        author    = opts['author'] || {}
-        info = {
-          url: "#{configuration.load[:gitlab_url]}/#{repository_name}/merge_requests/#{opts['iid']}",
-          assignee: {
-            username: assignee['username'],
-            email:    assignee['email'],
-            name:     assignee['name']
-          },
-          author: {
-            username: author['username'],
-            email:    author['email'],
-            name:     author['name']
-          },
-          id:         opts['id'],
-          iid:        opts['iid'],
-          created_at: assignee['created_at']
-        }
-        ap params.merge({repository_name: repository_name}.merge(info))
+        result = mr_command.create(user_id: user_id, msg: msg, target_branch: target_branch)
+        dp result
+        irc_notify("Please review my merge request: #{result[:diff_url]}") if notify?
+      rescue Exception => e
+        dp e.message
       end
 
       def push=(origin=nil)
         @origin = origin || 'origin'
       end
 
-      def show=(bool)
-        @show = bool
-      end
-
-      def show?
-        @show
-      end
-
       def get_user_id(name)
         user  = nil
-        email = (configuration.load[:aliases] || {})[name]
-        user  = (configuration.load[:users] || {})[email] if email
+        email = (configuration.get(:aliases) || {})[name]
+        user  = (configuration.get(:users)   || {})[email] if email
         user  = users_repo.find(email: name) unless user
         user[:id] if user
       end
 
-      # Set/Get configuration
-      def config(params=[])
-        build_config(*params) if init?
-        ap configuration.load || "No configuration yet"
-      end
+      # Make Cache for user
+      def users_cache
+        return configuration.clear(:users) if clear?
 
-      # Set user alias
-      def user_alias(params)
-        if clear?
-          configuration.clear_user_aliases
-        else
-          params.empty? ? configuration.show_aliases : configuration.add_user_alias(email: params[0], alias: params[1])
+        users = {}.tap do |h|
+          users_repo.list.each{ |u| h[u['email']] = u }
         end
-        config
+
+        configuration.set(:users, users)
       end
 
-      # Make Cache for user
-      def cache
-        if clear?
-          configuration.set_user_list({})
-        else
-          users = {}.tap do |h|
-            users_repo.list.each{ |u| h[u['email']] = u }
-          end
-          configuration.set_user_list(users)
+      # Set/Get configuration
+      def config(params=[])
+        return configuration.show(params) unless [set?, del?, add?, clear?].any?
+        key  = params.shift.to_sym
+
+        configuration.delete(key, params[0]) if del?
+        configuration.clear(key)             if clear?
+
+        if set? || add?
+          opts = build_configuration_params(params)
+          configuration.set(key, opts) if set?
+          configuration.add(key, opts) if add?
         end
-        config
-      end
 
-      def clear=(bool)
-        @clear = bool
-      end
+        #TODO later
+        key = ['notify', 'irc'] if key == :notify_irc
 
-      def clear?
-        @clear
+        configuration.show(key)
       end
 
+      #flags
+      def s=(bool); @set = bool; end
+      def set=(bool); @set = bool; end
+      def set?; @set; end
 
-      #initialize configutation  | cmd  glman config [gitlab_url] [private_token] --init
-      def init=(bool)
-        @init = bool
-      end
+      def a=(bool); @add = bool; end
+      def add=(bool); @add = bool; end
+      def add?; @add; end
 
-      #
-      def init?
-        @init
-      end
+      def d=(bool); @del = bool; end
+      def del=(bool); @del = bool; end
+      def del?; @del; end
+
+      def c=(bool); @clear = bool; end
+      def clear=(bool); @clear = bool; end
+      def clear?; @clear; end
+
+      def n=(bool); @notify = bool; end
+      def notify=(bool); @notify = bool; end
+      def notify?; @notify; end
 
-      # Show help
       def help!
-        puts 'Need help :D'
-        puts help_page
+        puts Glman::Commands::HelpMessages.show
         exit
       end
       alias :h! :help!
 
       #Exec
       def call(name=nil, *params)
-        intro
+        puts Glman::Commands::HelpMessages.intro
         case name.to_s.strip
-          when 'config' then config(params)
-          when 'alias'  then user_alias(params)
-          when 'cache'  then cache
-          when 'mr'     then mr(params)
-          when ''       then puts '-'
+          when 'config'      then config(params)
+          when 'alias'       then user_alias(params)
+          when 'users_cache' then users_cache
+          when 'mr'          then mr(params)
+          when ''            then puts Glman::Commands::HelpMessages.unknown_command
           else puts "what ?"
         end
       end
+
       private
+
       attr_reader :origin
 
+      def build_configuration_params(params)
+        Hash.new.tap do |h|
+          params.each{ |e| e = e.split(':'); h[e.shift.to_sym] = e.join(':') }
+        end
+      end
+
       def push_branch_first(origin, branch)
         p "push branch: #{branch} to origin: origin"
         git_repo.push('origin', branch)
@@ -150,68 +128,38 @@ module Glman
         ap projects_repo.get_merge_requests(git_repo.repository_name)
       end
 
-      def build_config(gitlab_url, private_token)
-        configuration.build_config(gitlab_url: gitlab_url, private_token: private_token)
-      end
-
       def configuration
-        @configuration ||= Configuration.new
+        @configuration ||= Glman::Commands::Config.new(config_manager: ConfigManager.new)
       end
 
       def users_repo
-        @users_repo ||= Repos::UsersRepo.new(configuration.load)
+        @users_repo ||= Repos::UsersRepo.new(configuration.get(:gitlab))
       end
 
       def projects_repo
-        @projects_repo ||= Repos::ProjectsRepo.new(configuration.load)
+        @projects_repo ||= Repos::ProjectsRepo.new(configuration.get(:gitlab))
       end
 
       def git_repo
         @git_repo ||= Repos::GitRepo.new
       end
 
-      def notify(msg)
-        nick = configuration.load[:irc][:channel] || 'glman'
-        irc_client.register(nick)
-        irc_client.notify(configuration.load[:irc][:channel], msg)
-        client.quit
+      def mr_command
+        @mr_command ||= Glman::Commands::Mr.new(git_repo: git_repo, projects_repo: projects_repo, config: configuration.get(:gitlab))
       end
 
-      def irc_client
-        @irc_client ||= (
-          irc_config = configuration.load[:irc]
-          server = irc_config[:server] || "irc.freenode.net"
-          port   = (irc_config[:port] || 6697).to_i
-          ssl    = irc_config[:ssl] == true ? true : false
-          IrcNotify::Client.build(server, port, ssl: ssl)
-        )
-      end
-
-      def help_page
-        %{
-commands:
-
-config                                      # display current configuration
-config <gitlab_url> <private_token> --init  # init configuration
-notify_config <server:port> <channel> <ssl> # setup irc configuration for notifications
-
-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
-        }
+      def irc_conf
+        @irc_conf ||= configuration.get(:notify_irc)
       end
 
-      def intro
-        puts "Glman ver: #{VERSION}"
+      def irc_notify(msg)
+        c       = IrcNotify::Client.build(irc_conf[:server], irc_conf[:port], ssl: irc_conf[:ssl])
+        nick    = irc_conf[:nick] || "glman-#{git_repo.user_name.strip.downcase.gsub(' ','-')}"
+        channel = '#' + irc_conf[:channel].gsub('#', '')
+        c.register(nick)
+        c.notify(channel, msg)
+        c.quit
       end
     end
   end

data/lib/glman/commands/config.rb

@@ -0,0 +1,65 @@
+require "irc-notify"
+
+module Glman
+  module Commands
+    class Config
+
+      include InitRequired
+
+      attr_required :config_manager
+
+      def show(params=[])
+        get_configuration_by_key(params).tap do |conf|
+          dp conf.blank? ? "No configuration yet" : conf
+        end
+      end
+
+      def set(name, hash={})
+        send("#{name}_conf").set(hash)
+      end
+
+      def get(name)
+        send("#{name}_conf").get
+      end
+
+      def clear(name)
+        send("#{name}_conf").clear
+      end
+
+      def add(name, params)
+        send("#{name}_conf").add(params)
+      end
+
+      def delete(name, params)
+        send("#{name}_conf").delete(params)
+      end
+
+      private
+
+      def get_configuration_by_key(params)
+        return config_manager.get if params.blank?
+        return config_manager.get[params.to_sym] unless params.kind_of?(Array)
+
+        conf = config_manager.get
+        params.compact.each{ |key| conf = conf[key.to_sym] || {} }
+        conf
+      end
+
+      def users_conf
+        @users_conf ||= Glman::Commands::Configs::UsersConfig.new(config_manager: config_manager)
+      end
+
+      def notify_irc_conf
+        @notify_irc_conf ||= Glman::Commands::Configs::NotifyIrcConfig.new(config_manager: config_manager)
+      end
+
+      def gitlab_conf
+        @gitlab_conf ||= Glman::Commands::Configs::GitlabConfig.new(config_manager: config_manager)
+      end
+
+      def aliases_conf
+        @aliases_conf ||= Glman::Commands::Configs::AliasesConfig.new(config_manager: config_manager)
+      end
+    end
+  end
+end