git-process 0.9.2 → 0.9.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/Gemfile +1 -20
- data/Gemfile.lock +16 -11
- data/git-process.gemspec +17 -2
- data/lib/git-process/git_branches.rb +1 -1
- data/lib/git-process/version.rb +1 -1
- metadata +165 -11
- data/.gitignore +0 -16
- data/.rspec +0 -3
- data/.travis.yml +0 -4
    
        data/Gemfile
    CHANGED
    
    | @@ -1,22 +1,3 @@ | |
| 1 1 | 
             
            source "http://rubygems.org"
         | 
| 2 2 |  | 
| 3 | 
            -
             | 
| 4 | 
            -
            gem "launchy", "~> 2.1.0" # web browser interaction
         | 
| 5 | 
            -
            gem "octokit", "~> 1.4.0" # GitHub API
         | 
| 6 | 
            -
            gem "json", "~> 1.7.3"
         | 
| 7 | 
            -
            gem "trollop", "~> 1.16.2" # CLI options parser
         | 
| 8 | 
            -
            gem "highline", "~> 1.6.12" # user CLI interaction
         | 
| 9 | 
            -
            gem "termios", "~> 0.9.4"  # used by highline to make things a little nicer
         | 
| 10 | 
            -
            gem "system_timer", "~> 1.2.4" # Needed by faraday via octokit
         | 
| 11 | 
            -
             | 
| 12 | 
            -
            group :test do
         | 
| 13 | 
            -
              gem "rspec", "~> 2.10.0", :group => :test
         | 
| 14 | 
            -
              gem "rspec-mocks", "~> 2.10.0", :group => :test
         | 
| 15 | 
            -
              gem "webmock", "~> 1.8.7", :group => :test # network mocking
         | 
| 16 | 
            -
            end
         | 
| 17 | 
            -
             | 
| 18 | 
            -
            group :development do
         | 
| 19 | 
            -
              gem "rake", "~> 0.9.2"
         | 
| 20 | 
            -
              gem "yard", "~> 0.8.2.1" # documentation generator
         | 
| 21 | 
            -
              gem "redcarpet", "~> 2.1.1"
         | 
| 22 | 
            -
            end
         | 
| 3 | 
            +
            gemspec
         | 
    
        data/Gemfile.lock
    CHANGED
    
    | @@ -1,3 +1,15 @@ | |
| 1 | 
            +
            PATH
         | 
| 2 | 
            +
              remote: .
         | 
| 3 | 
            +
              specs:
         | 
| 4 | 
            +
                git-process (0.9.3)
         | 
| 5 | 
            +
                  highline (~> 1.6.12)
         | 
| 6 | 
            +
                  json (~> 1.7.3)
         | 
| 7 | 
            +
                  launchy (~> 2.1.0)
         | 
| 8 | 
            +
                  octokit (~> 1.4.0)
         | 
| 9 | 
            +
                  system_timer (~> 1.2.4)
         | 
| 10 | 
            +
                  termios (~> 0.9.4)
         | 
| 11 | 
            +
                  trollop (~> 1.16.2)
         | 
| 12 | 
            +
             | 
| 1 13 | 
             
            GEM
         | 
| 2 14 | 
             
              remote: http://rubygems.org/
         | 
| 3 15 | 
             
              specs:
         | 
| @@ -6,10 +18,10 @@ GEM | |
| 6 18 | 
             
                diff-lcs (1.1.3)
         | 
| 7 19 | 
             
                faraday (0.8.1)
         | 
| 8 20 | 
             
                  multipart-post (~> 1.1)
         | 
| 9 | 
            -
                faraday_middleware (0.8. | 
| 21 | 
            +
                faraday_middleware (0.8.8)
         | 
| 10 22 | 
             
                  faraday (>= 0.7.4, < 0.9)
         | 
| 11 23 | 
             
                hashie (1.2.0)
         | 
| 12 | 
            -
                highline (1.6. | 
| 24 | 
            +
                highline (1.6.13)
         | 
| 13 25 | 
             
                json (1.7.3)
         | 
| 14 26 | 
             
                launchy (2.1.0)
         | 
| 15 27 | 
             
                  addressable (~> 2.2.6)
         | 
| @@ -21,7 +33,7 @@ GEM | |
| 21 33 | 
             
                  faraday_middleware (~> 0.8)
         | 
| 22 34 | 
             
                  hashie (~> 1.2)
         | 
| 23 35 | 
             
                  multi_json (~> 1.3)
         | 
| 24 | 
            -
                rake (0.9.2)
         | 
| 36 | 
            +
                rake (0.9.2.2)
         | 
| 25 37 | 
             
                redcarpet (2.1.1)
         | 
| 26 38 | 
             
                rspec (2.10.0)
         | 
| 27 39 | 
             
                  rspec-core (~> 2.10.0)
         | 
| @@ -43,16 +55,9 @@ PLATFORMS | |
| 43 55 | 
             
              ruby
         | 
| 44 56 |  | 
| 45 57 | 
             
            DEPENDENCIES
         | 
| 46 | 
            -
               | 
| 47 | 
            -
              json (~> 1.7.3)
         | 
| 48 | 
            -
              launchy (~> 2.1.0)
         | 
| 49 | 
            -
              octokit (~> 1.4.0)
         | 
| 58 | 
            +
              git-process!
         | 
| 50 59 | 
             
              rake (~> 0.9.2)
         | 
| 51 60 | 
             
              redcarpet (~> 2.1.1)
         | 
| 52 61 | 
             
              rspec (~> 2.10.0)
         | 
| 53 | 
            -
              rspec-mocks (~> 2.10.0)
         | 
| 54 | 
            -
              system_timer (~> 1.2.4)
         | 
| 55 | 
            -
              termios (~> 0.9.4)
         | 
| 56 | 
            -
              trollop (~> 1.16.2)
         | 
| 57 62 | 
             
              webmock (~> 1.8.7)
         | 
| 58 63 | 
             
              yard (~> 0.8.2.1)
         | 
    
        data/git-process.gemspec
    CHANGED
    
    | @@ -7,10 +7,25 @@ Gem::Specification.new do |gem| | |
| 7 7 | 
             
              gem.description   = %q{A set of scripts to make working with git easier and more consistent}
         | 
| 8 8 | 
             
              gem.summary       = %q{A set of scripts for a good git process}
         | 
| 9 9 | 
             
              gem.homepage      = "http://jdigger.github.com/git-process/"
         | 
| 10 | 
            +
              gem.license       = 'ASL2'
         | 
| 10 11 |  | 
| 11 | 
            -
              gem. | 
| 12 | 
            +
              gem.add_dependency "launchy", "~> 2.1.0" # web browser interaction
         | 
| 13 | 
            +
              gem.add_dependency "octokit", "~> 1.4.0" # GitHub API
         | 
| 14 | 
            +
              gem.add_dependency "json", "~> 1.7.3"
         | 
| 15 | 
            +
              gem.add_dependency "trollop", "~> 1.16.2" # CLI options parser
         | 
| 16 | 
            +
              gem.add_dependency "highline", "~> 1.6.12" # user CLI interaction
         | 
| 17 | 
            +
              gem.add_dependency "termios", "~> 0.9.4"  # used by highline to make things a little nicer
         | 
| 18 | 
            +
              gem.add_dependency "system_timer", "~> 1.2.4" # Needed by faraday via octokit
         | 
| 12 19 |  | 
| 13 | 
            -
              gem. | 
| 20 | 
            +
              gem.add_development_dependency "rake", "~> 0.9.2"
         | 
| 21 | 
            +
              gem.add_development_dependency "yard", "~> 0.8.2.1" # documentation generator
         | 
| 22 | 
            +
              gem.add_development_dependency "redcarpet", "~> 2.1.1"
         | 
| 23 | 
            +
             | 
| 24 | 
            +
              # Testing
         | 
| 25 | 
            +
              gem.add_development_dependency "rspec", "~> 2.10.0"
         | 
| 26 | 
            +
              gem.add_development_dependency "webmock", "~> 1.8.7" # network mocking
         | 
| 27 | 
            +
             | 
| 28 | 
            +
              gem.files         = `git ls-files`.split($\).delete_if{|f| f =~ /^\./}
         | 
| 14 29 | 
             
              gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
         | 
| 15 30 | 
             
              gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
         | 
| 16 31 | 
             
              gem.name          = "git-process"
         | 
| @@ -61,7 +61,7 @@ module GitProc | |
| 61 61 | 
             
                def [](branch_name)
         | 
| 62 62 | 
             
                  branch_name = current.name if branch_name == 'HEAD'
         | 
| 63 63 | 
             
                  br = @items.find {|b| b.name == branch_name}
         | 
| 64 | 
            -
                   | 
| 64 | 
            +
                  if br.nil? and br.local?
         | 
| 65 65 | 
             
                    @lib.logger.warn {"Could not find '#{branch_name}' in #{@items.map{|i|i.name}.join(',')}"}
         | 
| 66 66 | 
             
                  end
         | 
| 67 67 | 
             
                  br
         | 
    
        data/lib/git-process/version.rb
    CHANGED
    
    
    
        metadata
    CHANGED
    
    | @@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version | |
| 5 5 | 
             
              segments: 
         | 
| 6 6 | 
             
              - 0
         | 
| 7 7 | 
             
              - 9
         | 
| 8 | 
            -
              -  | 
| 9 | 
            -
              version: 0.9. | 
| 8 | 
            +
              - 3
         | 
| 9 | 
            +
              version: 0.9.3
         | 
| 10 10 | 
             
            platform: ruby
         | 
| 11 11 | 
             
            authors: 
         | 
| 12 12 | 
             
            - Jim Moore
         | 
| @@ -18,17 +18,174 @@ date: 2012-07-10 00:00:00 -06:00 | |
| 18 18 | 
             
            default_executable: 
         | 
| 19 19 | 
             
            dependencies: 
         | 
| 20 20 | 
             
            - !ruby/object:Gem::Dependency 
         | 
| 21 | 
            -
              type: : | 
| 21 | 
            +
              type: :runtime
         | 
| 22 22 | 
             
              version_requirements: &id001 !ruby/object:Gem::Requirement 
         | 
| 23 23 | 
             
                requirements: 
         | 
| 24 | 
            -
                - -  | 
| 24 | 
            +
                - - ~>
         | 
| 25 25 | 
             
                  - !ruby/object:Gem::Version 
         | 
| 26 26 | 
             
                    segments: 
         | 
| 27 | 
            +
                    - 2
         | 
| 28 | 
            +
                    - 1
         | 
| 27 29 | 
             
                    - 0
         | 
| 28 | 
            -
                    version:  | 
| 29 | 
            -
              name:  | 
| 30 | 
            +
                    version: 2.1.0
         | 
| 31 | 
            +
              name: launchy
         | 
| 30 32 | 
             
              requirement: *id001
         | 
| 31 33 | 
             
              prerelease: false
         | 
| 34 | 
            +
            - !ruby/object:Gem::Dependency 
         | 
| 35 | 
            +
              type: :runtime
         | 
| 36 | 
            +
              version_requirements: &id002 !ruby/object:Gem::Requirement 
         | 
| 37 | 
            +
                requirements: 
         | 
| 38 | 
            +
                - - ~>
         | 
| 39 | 
            +
                  - !ruby/object:Gem::Version 
         | 
| 40 | 
            +
                    segments: 
         | 
| 41 | 
            +
                    - 1
         | 
| 42 | 
            +
                    - 4
         | 
| 43 | 
            +
                    - 0
         | 
| 44 | 
            +
                    version: 1.4.0
         | 
| 45 | 
            +
              name: octokit
         | 
| 46 | 
            +
              requirement: *id002
         | 
| 47 | 
            +
              prerelease: false
         | 
| 48 | 
            +
            - !ruby/object:Gem::Dependency 
         | 
| 49 | 
            +
              type: :runtime
         | 
| 50 | 
            +
              version_requirements: &id003 !ruby/object:Gem::Requirement 
         | 
| 51 | 
            +
                requirements: 
         | 
| 52 | 
            +
                - - ~>
         | 
| 53 | 
            +
                  - !ruby/object:Gem::Version 
         | 
| 54 | 
            +
                    segments: 
         | 
| 55 | 
            +
                    - 1
         | 
| 56 | 
            +
                    - 7
         | 
| 57 | 
            +
                    - 3
         | 
| 58 | 
            +
                    version: 1.7.3
         | 
| 59 | 
            +
              name: json
         | 
| 60 | 
            +
              requirement: *id003
         | 
| 61 | 
            +
              prerelease: false
         | 
| 62 | 
            +
            - !ruby/object:Gem::Dependency 
         | 
| 63 | 
            +
              type: :runtime
         | 
| 64 | 
            +
              version_requirements: &id004 !ruby/object:Gem::Requirement 
         | 
| 65 | 
            +
                requirements: 
         | 
| 66 | 
            +
                - - ~>
         | 
| 67 | 
            +
                  - !ruby/object:Gem::Version 
         | 
| 68 | 
            +
                    segments: 
         | 
| 69 | 
            +
                    - 1
         | 
| 70 | 
            +
                    - 16
         | 
| 71 | 
            +
                    - 2
         | 
| 72 | 
            +
                    version: 1.16.2
         | 
| 73 | 
            +
              name: trollop
         | 
| 74 | 
            +
              requirement: *id004
         | 
| 75 | 
            +
              prerelease: false
         | 
| 76 | 
            +
            - !ruby/object:Gem::Dependency 
         | 
| 77 | 
            +
              type: :runtime
         | 
| 78 | 
            +
              version_requirements: &id005 !ruby/object:Gem::Requirement 
         | 
| 79 | 
            +
                requirements: 
         | 
| 80 | 
            +
                - - ~>
         | 
| 81 | 
            +
                  - !ruby/object:Gem::Version 
         | 
| 82 | 
            +
                    segments: 
         | 
| 83 | 
            +
                    - 1
         | 
| 84 | 
            +
                    - 6
         | 
| 85 | 
            +
                    - 12
         | 
| 86 | 
            +
                    version: 1.6.12
         | 
| 87 | 
            +
              name: highline
         | 
| 88 | 
            +
              requirement: *id005
         | 
| 89 | 
            +
              prerelease: false
         | 
| 90 | 
            +
            - !ruby/object:Gem::Dependency 
         | 
| 91 | 
            +
              type: :runtime
         | 
| 92 | 
            +
              version_requirements: &id006 !ruby/object:Gem::Requirement 
         | 
| 93 | 
            +
                requirements: 
         | 
| 94 | 
            +
                - - ~>
         | 
| 95 | 
            +
                  - !ruby/object:Gem::Version 
         | 
| 96 | 
            +
                    segments: 
         | 
| 97 | 
            +
                    - 0
         | 
| 98 | 
            +
                    - 9
         | 
| 99 | 
            +
                    - 4
         | 
| 100 | 
            +
                    version: 0.9.4
         | 
| 101 | 
            +
              name: termios
         | 
| 102 | 
            +
              requirement: *id006
         | 
| 103 | 
            +
              prerelease: false
         | 
| 104 | 
            +
            - !ruby/object:Gem::Dependency 
         | 
| 105 | 
            +
              type: :runtime
         | 
| 106 | 
            +
              version_requirements: &id007 !ruby/object:Gem::Requirement 
         | 
| 107 | 
            +
                requirements: 
         | 
| 108 | 
            +
                - - ~>
         | 
| 109 | 
            +
                  - !ruby/object:Gem::Version 
         | 
| 110 | 
            +
                    segments: 
         | 
| 111 | 
            +
                    - 1
         | 
| 112 | 
            +
                    - 2
         | 
| 113 | 
            +
                    - 4
         | 
| 114 | 
            +
                    version: 1.2.4
         | 
| 115 | 
            +
              name: system_timer
         | 
| 116 | 
            +
              requirement: *id007
         | 
| 117 | 
            +
              prerelease: false
         | 
| 118 | 
            +
            - !ruby/object:Gem::Dependency 
         | 
| 119 | 
            +
              type: :development
         | 
| 120 | 
            +
              version_requirements: &id008 !ruby/object:Gem::Requirement 
         | 
| 121 | 
            +
                requirements: 
         | 
| 122 | 
            +
                - - ~>
         | 
| 123 | 
            +
                  - !ruby/object:Gem::Version 
         | 
| 124 | 
            +
                    segments: 
         | 
| 125 | 
            +
                    - 0
         | 
| 126 | 
            +
                    - 9
         | 
| 127 | 
            +
                    - 2
         | 
| 128 | 
            +
                    version: 0.9.2
         | 
| 129 | 
            +
              name: rake
         | 
| 130 | 
            +
              requirement: *id008
         | 
| 131 | 
            +
              prerelease: false
         | 
| 132 | 
            +
            - !ruby/object:Gem::Dependency 
         | 
| 133 | 
            +
              type: :development
         | 
| 134 | 
            +
              version_requirements: &id009 !ruby/object:Gem::Requirement 
         | 
| 135 | 
            +
                requirements: 
         | 
| 136 | 
            +
                - - ~>
         | 
| 137 | 
            +
                  - !ruby/object:Gem::Version 
         | 
| 138 | 
            +
                    segments: 
         | 
| 139 | 
            +
                    - 0
         | 
| 140 | 
            +
                    - 8
         | 
| 141 | 
            +
                    - 2
         | 
| 142 | 
            +
                    - 1
         | 
| 143 | 
            +
                    version: 0.8.2.1
         | 
| 144 | 
            +
              name: yard
         | 
| 145 | 
            +
              requirement: *id009
         | 
| 146 | 
            +
              prerelease: false
         | 
| 147 | 
            +
            - !ruby/object:Gem::Dependency 
         | 
| 148 | 
            +
              type: :development
         | 
| 149 | 
            +
              version_requirements: &id010 !ruby/object:Gem::Requirement 
         | 
| 150 | 
            +
                requirements: 
         | 
| 151 | 
            +
                - - ~>
         | 
| 152 | 
            +
                  - !ruby/object:Gem::Version 
         | 
| 153 | 
            +
                    segments: 
         | 
| 154 | 
            +
                    - 2
         | 
| 155 | 
            +
                    - 1
         | 
| 156 | 
            +
                    - 1
         | 
| 157 | 
            +
                    version: 2.1.1
         | 
| 158 | 
            +
              name: redcarpet
         | 
| 159 | 
            +
              requirement: *id010
         | 
| 160 | 
            +
              prerelease: false
         | 
| 161 | 
            +
            - !ruby/object:Gem::Dependency 
         | 
| 162 | 
            +
              type: :development
         | 
| 163 | 
            +
              version_requirements: &id011 !ruby/object:Gem::Requirement 
         | 
| 164 | 
            +
                requirements: 
         | 
| 165 | 
            +
                - - ~>
         | 
| 166 | 
            +
                  - !ruby/object:Gem::Version 
         | 
| 167 | 
            +
                    segments: 
         | 
| 168 | 
            +
                    - 2
         | 
| 169 | 
            +
                    - 10
         | 
| 170 | 
            +
                    - 0
         | 
| 171 | 
            +
                    version: 2.10.0
         | 
| 172 | 
            +
              name: rspec
         | 
| 173 | 
            +
              requirement: *id011
         | 
| 174 | 
            +
              prerelease: false
         | 
| 175 | 
            +
            - !ruby/object:Gem::Dependency 
         | 
| 176 | 
            +
              type: :development
         | 
| 177 | 
            +
              version_requirements: &id012 !ruby/object:Gem::Requirement 
         | 
| 178 | 
            +
                requirements: 
         | 
| 179 | 
            +
                - - ~>
         | 
| 180 | 
            +
                  - !ruby/object:Gem::Version 
         | 
| 181 | 
            +
                    segments: 
         | 
| 182 | 
            +
                    - 1
         | 
| 183 | 
            +
                    - 8
         | 
| 184 | 
            +
                    - 7
         | 
| 185 | 
            +
                    version: 1.8.7
         | 
| 186 | 
            +
              name: webmock
         | 
| 187 | 
            +
              requirement: *id012
         | 
| 188 | 
            +
              prerelease: false
         | 
| 32 189 | 
             
            description: A set of scripts to make working with git easier and more consistent
         | 
| 33 190 | 
             
            email: 
         | 
| 34 191 | 
             
            - moore.jim@gmail.com
         | 
| @@ -42,9 +199,6 @@ extensions: [] | |
| 42 199 | 
             
            extra_rdoc_files: []
         | 
| 43 200 |  | 
| 44 201 | 
             
            files: 
         | 
| 45 | 
            -
            - .gitignore
         | 
| 46 | 
            -
            - .rspec
         | 
| 47 | 
            -
            - .travis.yml
         | 
| 48 202 | 
             
            - CHANGELOG.md
         | 
| 49 203 | 
             
            - Gemfile
         | 
| 50 204 | 
             
            - Gemfile.lock
         | 
| @@ -91,8 +245,8 @@ files: | |
| 91 245 | 
             
            - spec/sync_spec.rb
         | 
| 92 246 | 
             
            has_rdoc: true
         | 
| 93 247 | 
             
            homepage: http://jdigger.github.com/git-process/
         | 
| 94 | 
            -
            licenses:  | 
| 95 | 
            -
             | 
| 248 | 
            +
            licenses: 
         | 
| 249 | 
            +
            - ASL2
         | 
| 96 250 | 
             
            post_install_message: 
         | 
| 97 251 | 
             
            rdoc_options: []
         | 
| 98 252 |  | 
    
        data/.gitignore
    DELETED
    
    
    
        data/.rspec
    DELETED
    
    
    
        data/.travis.yml
    DELETED