ggsm 0.0.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb2c2037175994ed2bd23520d559bdb762590637
-  data.tar.gz: 17769fd7d42ac88098c69e95c7d7f5ee20aeebba
+  metadata.gz: fdb26eff5e32f1ba8b71d831c1882c6e8b1ece4a
+  data.tar.gz: c784dbf1527230dc28e27604e903230fe961d51b
 SHA512:
-  metadata.gz: 8d802ef18b80139965f6eefe6f94fe621274a1bc3d505fb55e0e3ac77a3e3b2342fcf0eeb9d8ee3363b206ebebf544ed19f91e70772a352fcff143bc34c9d125
-  data.tar.gz: d7cffcb433da0114517f9ba350dc0896103d1730270abc1b9d07854bd4e8ecb8e179178ccfb80bebce56be49fc1bf61c6347f0aa0ddeffe192ee1b164366ab7a
+  metadata.gz: 7520bd496694396834e374671dc004762b132cf2c910cf58c03170355953375a6f4461e2831d6ec46174a3ada2dc206d9325d75a04d4a2e9b027587844e171a1
+  data.tar.gz: 4db64a146f5901380e24054fb4cae81e3afdb9167ddae0a4d1b184a27ed4d87dee29e2f1442ec073c14c831476fba7caaeafe9a018fc3092fa01a5a3569f5882

data/.gitignore

@@ -0,0 +1,13 @@
+/.bundle/
+/.yardoc
+/Gemfile.lock
+/_yardoc/
+/coverage/
+/doc/
+/pkg/
+/spec/reports/
+/tmp/
+.idea/
+
+# rspec failure tracking
+.rspec_status

data/.rspec

@@ -0,0 +1,2 @@
+--format documentation
+--color

data/.travis.yml

@@ -0,0 +1,5 @@
+sudo: false
+language: ruby
+rvm:
+  - 2.0.0
+before_install: gem install bundler -v 1.14.6

data/CODE_OF_CONDUCT.md

@@ -0,0 +1,74 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level of experience,
+nationality, personal appearance, race, religion, or sexual identity and
+orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at yokeyword@gmail.com. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/

data/Gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in ggsm.gemspec
+gemspec

data/LICENSE.txt

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2017 YoKey
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.md

@@ -0,0 +1,41 @@
+# GGSM
+
+Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/hex`. To experiment with that code, run `bin/console` for an interactive prompt.
+
+TODO: Delete this and the text above, and describe your gem
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+```ruby
+gem 'ggsm'
+```
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install hex
+
+## Usage
+
+TODO: Write usage instructions here
+
+## Development
+
+After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+
+To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+
+## Contributing
+
+Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/hex. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+
+
+## License
+
+The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
+

data/Rakefile

@@ -1,8 +1,6 @@
-require 'rake/testtask'
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
 
-Rake::TestTask.new do |t|
-  t.libs << 'test'
-end
+RSpec::Core::RakeTask.new(:spec)
 
-desc "Run tests"
-task :default => :test
+task :default => :spec

data/bin/ggsm

@@ -1,2 +1,11 @@
-require 'ggsm'
-puts "install success"
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+require_relative '../lib/ggsm'
+
+begin
+  GGSM::Cli.start ARGV
+rescue => e
+  puts "error: #{e}"
+  exit 1
+end

data/ggsm.gemspec

@@ -0,0 +1,30 @@
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'ggsm/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = 'ggsm'
+  spec.version       = GGSM::VERSION
+  spec.authors       = ['YoKey']
+  spec.email         = ['328903522@qq.com']
+
+  spec.summary       = 'ggsm'
+  spec.description   = 'A gem for Git Submodule'
+  spec.homepage      = 'http://rubygems.org/gems/ggsm'
+  spec.license       = 'MIT'
+
+
+  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
+    f.match(%r{^(test|spec|features)/})
+  end
+
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.require_paths = ['lib']
+
+  spec.add_development_dependency 'bundler', '~> 1.14'
+  spec.add_development_dependency 'rake', '~> 10.0'
+
+  spec.add_dependency 'thor'
+  spec.add_dependency 'colorize'
+end

data/lib/ggsm.rb

@@ -1,29 +1,53 @@
-#!/usr/bin/ruby
-command = ""
+require 'thor'
+require_relative 'ggsm/version'
+require_relative 'ggsm/flow/start'
+require_relative 'ggsm/flow/update'
+require_relative 'ggsm/flow/sync'
+require_relative 'ggsm/flow/switch'
+require_relative 'ggsm/flow/delete'
+require_relative 'ggsm/flow/foreach'
 
-ARGV.each do |arg|
-	command = "#{command} #{arg}"
-end
+module GGSM
+  class Cli < Thor
+    include Start
+    include Update
+    include Sync
+    include Switch
+    include Delete
+    include Foreach
 
+    desc 'start <branch> [<commit>] [<origin>]', 'Start to develop new feature'
+    def start(branch, action='')
+      start_flow(branch, action)
+    end
 
-if ARGV[0] == "update"
-	command = "git submodule update --init --recursive"
-elsif ARGV[0] == "commit" || ARGV[0] == "ci"
-	if(ARGV[1] == "-m")
-		splitCommand = command.split("-m ")
-		command = "git#{splitCommand[0]}#{ARGV[1]} \"#{splitCommand[1]}\""
-	else
-		command = "git#{command}"
-	end
-	command = "git submodule foreach #{command};git add .;#{command}"
-else
-	command = "git#{command};git submodule foreach git#{command}"
-end
+    desc 'switch <branch>', 'Switch to branch <branch>'
+    def switch(branch)
+      switch_flow(branch)
+    end
+
+    desc 'update', 'Update submodule'
+    def update
+      update_flow
+    end
 
-puts "执行: #{command}"
-system command
+    desc 'sync', 'Sync remote app and submodules'
+    def sync
+      sync_flow
+    end
 
-if ARGV[0] == "pull" || ((ARGV[0] == "checkout" || ARGV[0] == "co") && (ARGV[1] != "-b" || ARGV[1] != "-d" || ARGV[1] != "-D"))
-puts "刷新子模块：ggsm update"
-system "git submodule update --init --recursive"
-end
+    desc 'delete <branch> [-r|--remote] [-a|--all]', 'Delete <branch>'
+    option :remote, :default => false, :type => :boolean, aliases: '-r'
+    option :all, :default => false, :type => :boolean, aliases: '-a'
+    def delete(branch)
+      remote = options[:remote]
+      all = options[:all]
+      delete_flow(branch, remote, all)
+    end
+
+    desc 'foreach [<commands>...]', 'Executes the git command in each module'
+    def foreach(*commands)
+      foreach_flow(*commands)
+    end
+  end
+end

data/lib/ggsm/flow/delete.rb

@@ -0,0 +1,38 @@
+require_relative '../util/submodule'
+require_relative '../util/stash'
+
+module GGSM
+  module Delete
+    include Submodule
+    include Stash
+
+    def delete_flow(branch, remote, all)
+      unless check_submodule
+        return
+      end
+
+      puts '==> 进入主工程：'.yellow
+
+      delete_branch(all, branch, remote)
+
+      subs = get_submodule
+      subs.each do |sub|
+        Dir.chdir sub
+        puts "==> 进入#{sub}：".yellow
+        delete_branch(all, branch, remote)
+        Dir.chdir '..'
+      end
+    end
+
+    def delete_branch(all, branch, remote)
+      if all
+        system "git branch -D #{branch}"
+        system "git push origin -d #{branch}"
+      elsif remote
+        system "git push origin -d #{branch}"
+      else
+        system "git branch -D #{branch}"
+      end
+    end
+  end
+end

data/lib/ggsm/flow/foreach.rb

@@ -0,0 +1,42 @@
+require 'colorize'
+require_relative '../util/submodule'
+require_relative '../util/stash'
+
+module GGSM
+  module Foreach
+    include Submodule
+    include Stash
+
+    def foreach_flow(*commands)
+      unless check_submodule
+        return
+      end
+
+      cmd = ''
+      if commands.size == 0
+        puts '请输入正确git命令 foreach [<commands>...]'.red
+        return
+      elsif commands.fetch(0) == 'git'
+        commands.delete_at(0)
+      end
+
+      commands.each do |arg|
+        cmd = "#{cmd} #{arg}"
+      end
+      puts cmd
+
+      subs = get_submodule
+      subs.each do |sub|
+        Dir.chdir sub
+        puts "==> *进入#{sub}：".yellow
+        system "git #{cmd}"
+        Dir.chdir '..'
+      end
+
+      puts '==> *进入主工程：'.yellow
+      system "git #{cmd}"
+
+      puts "Modules执行：git#{cmd}".blue
+    end
+  end
+end

data/lib/ggsm/flow/start.rb

@@ -0,0 +1,52 @@
+require 'colorize'
+require_relative '../util/submodule'
+require_relative '../util/stash'
+
+module GGSM
+  module Start
+    include Submodule
+    include Stash
+
+    def start_flow(branch, action)
+      unless check_submodule
+        return
+      end
+
+      puts '==> 进入主工程：'.yellow
+
+      arry_conflict = []
+
+      need_stash = try_stash
+      result = system "git checkout -b #{branch} #{action}"
+      if need_stash
+        stash_pop(arry_conflict, '主工程')
+      end
+
+      unless result
+        return
+      end
+
+      `git submodule update --init --recursive`
+
+      subs = get_submodule
+      subs.each do |sub|
+        Dir.chdir sub
+        puts "==> 进入#{sub}：".yellow
+        need_stash = try_stash
+        system "git checkout -b #{branch}"
+        if need_stash
+          stash_pop(arry_conflict, sub)
+        end
+        Dir.chdir '..'
+      end
+
+      if arry_conflict.size > 0
+        tip = '==> 冲突待解决：'
+        arry_conflict.each do |sub|
+          tip = "#{tip}  #{sub}"
+        end
+        puts tip.red
+      end
+    end
+  end
+end

data/lib/ggsm/flow/switch.rb

@@ -0,0 +1,60 @@
+require 'colorize'
+require_relative '../util/submodule'
+require_relative '../util/stash'
+
+module GGSM
+  module Switch
+    include Submodule
+    include Stash
+
+    def switch_flow(branch)
+      unless check_submodule
+        return
+      end
+
+      puts '==> 进入主工程：'.yellow
+
+      arry_conflict = []
+
+      need_stash = try_stash
+      result = system "git checkout #{branch}"
+      if need_stash
+        stash_pop(arry_conflict, '主工程')
+      end
+
+      unless result
+        return
+      end
+
+      sub_commits = get_submodule_commit
+
+      subs = get_submodule
+      subs.each do |sub|
+        Dir.chdir sub
+        puts "==> 进入#{sub}：".yellow
+        need_stash = try_stash
+        result = system "git checkout #{branch}"
+
+        if result
+          system "git reset --hard #{sub_commits.fetch(subs.index(sub))}"
+        else
+          puts "[#{sub}] 没有#{branch}分支，创建并切换到#{branch}".blue
+          system "git checkout -b #{branch}"
+        end
+
+        if need_stash
+          stash_pop(arry_conflict, sub)
+        end
+        Dir.chdir '..'
+      end
+
+      if arry_conflict.size > 0
+        tip = '==> 冲突待解决：'
+        arry_conflict.each do |sub|
+          tip = "#{tip}  #{sub}"
+        end
+        puts tip.red
+      end
+    end
+  end
+end

data/lib/ggsm/flow/sync.rb

@@ -0,0 +1,22 @@
+require 'colorize'
+require_relative 'switch'
+
+module GGSM
+  module Sync
+    include Switch
+
+    def sync_flow
+      unless check_submodule
+        return
+      end
+
+      result = system 'git pull'
+      unless result
+        return
+      end
+
+      current_branch = `git branch | grep "*"`.split("* ")[1].split("\n")[0]
+      switch_flow(current_branch)
+    end
+  end
+end

data/lib/ggsm/flow/update.rb

@@ -0,0 +1,12 @@
+module GGSM
+  module Update
+    def update_flow
+      unless check_submodule
+        return
+      end
+
+      system 'git submodule update --init --recursive'
+      puts '==> 更新子模块完成！'.yellow
+    end
+  end
+end

data/lib/ggsm/util/stash.rb

@@ -0,0 +1,20 @@
+module GGSM
+  module Stash
+    def try_stash
+      status = `git status | grep 'nothing to commit'`
+      need_stash = false
+      if status.strip == ''
+        need_stash = true
+        `git stash`
+      end
+      need_stash
+    end
+
+    def stash_pop(arry_conflict, module_name)
+      stash_pop = `git stash pop | grep 'CONFLICT'`
+      if stash_pop.strip != ''
+        arry_conflict.push(module_name)
+      end
+    end
+  end
+end

data/lib/ggsm/util/submodule.rb

@@ -0,0 +1,37 @@
+module GGSM
+  module Submodule
+    def check_submodule
+      sub_str = `git submodule`
+      if sub_str.empty?
+        puts '所在目录工程下不存在Submodule，请检查所在目录！'.red
+        return false
+      end
+      return true
+    end
+
+    def get_submodule
+      sub_status = `git submodule`
+      pattern = /(?<=\s)[0-9a-zA-Z]*(?=\s)/
+      sub_status = sub_status.split(/\n/)
+
+      result = []
+      sub_status.each do |sub|
+        match = pattern.match(sub.strip)
+        result.push(match[0])
+      end
+      return result
+    end
+
+    def get_submodule_commit
+      sub_commits = `git ls-tree HEAD | grep "160000"`
+      pattern = /(?<=\s)[0-9a-zA-Z]{40}(?=\s)/
+      sub_commits = sub_commits.split(/\n/)
+      result = []
+      sub_commits.each do |sub|
+        match = pattern.match(sub.strip)
+        result.push(match[0][0...7])
+      end
+      return result
+    end
+  end
+end

data/lib/ggsm/version.rb

@@ -0,0 +1,3 @@
+module GGSM
+  VERSION = "1.0.0"
+end

metadata

@@ -1,25 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: ggsm
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 1.0.0
 platform: ruby
 authors:
 - YoKey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-04 00:00:00.000000000 Z
-dependencies: []
-description: A gem for gitsubmodule
-email: yokeyword@gmail.com
-executables: []
+date: 2017-05-31 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.14'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.14'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '10.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: A gem for Git Submodule
+email:
+- 328903522@qq.com
+executables:
+- ggsm
 extensions: []
 extra_rdoc_files: []
 files:
+- .gitignore
+- .rspec
+- .travis.yml
+- CODE_OF_CONDUCT.md
+- Gemfile
+- LICENSE.txt
+- README.md
 - Rakefile
-- lib/ggsm.rb
 - bin/ggsm
-- test/test_ggsm.rb
+- ggsm.gemspec
+- lib/ggsm.rb
+- lib/ggsm/flow/delete.rb
+- lib/ggsm/flow/foreach.rb
+- lib/ggsm/flow/start.rb
+- lib/ggsm/flow/switch.rb
+- lib/ggsm/flow/sync.rb
+- lib/ggsm/flow/update.rb
+- lib/ggsm/util/stash.rb
+- lib/ggsm/util/submodule.rb
+- lib/ggsm/version.rb
 homepage: http://rubygems.org/gems/ggsm
 licenses:
 - MIT
@@ -40,9 +114,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 2.6.12
 signing_key: 
-specification_version: 1
-summary: ggsm!
-test_files:
-- test/test_ggsm.rb
+specification_version: 4
+summary: ggsm
+test_files: []

data/test/test_ggsm.rb

@@ -1,6 +0,0 @@
-require 'test/unit'
-require 'ggsm'
-
-class HolaTest < Test::Unit::TestCase
- 
-end