gpig 0.0.31 → 0.0.32

Sign up to get free protection for your applications and to get access to all the features.
Files changed (4) hide show
  1. checksums.yaml +6 -14
  2. data/bin/gpig +16 -9
  3. data/lib/gpig/version.rb +1 -1
  4. metadata +13 -13
checksums.yaml CHANGED
@@ -1,15 +1,7 @@
1
1
  ---
2
- !binary "U0hBMQ==":
3
- metadata.gz: !binary |-
4
- ZmY5ZDBjZWQ4ZDI1ZWM2OTdiNDU0OWFkNDUzODVmYjJjZWQwOTg4NQ==
5
- data.tar.gz: !binary |-
6
- MzFiYWY0MDdhMWMyYmEwYjg5ZWIwZDdlM2YxZDU3YTFhNDBjMDM4Mg==
7
- !binary "U0hBNTEy":
8
- metadata.gz: !binary |-
9
- NjNkMGQ0MDIyZjU0NjliYjg0NTViNmRmMjdjNTBlYTZjNGY1MTUxMWRlMjBh
10
- YjRkYTI2YmUwODE2YTFjZDBjMThlYWFjOGRmZDg4MmJiMTQ0ZTZlNzc4NDZl
11
- YjA1Njc0NjE3MTA0ODYxNTc2Zjc0YTE4MTFiMGU3MjM1MWU2Yjc=
12
- data.tar.gz: !binary |-
13
- NWZkYWYzMmZlMjIxOTllNTg3MWExOTI0MzM0ZGFkZWJkZTdjMWYyZmY4MmU5
14
- ZTAwOGEzM2QyYzFhZDEwOWNiZDQxNzVmMTExZjllNjBkYTg0ZjI3MmM2NjVk
15
- NDhjZjI3MDhiNmIwMjU4NjdhMTA5MGI3ZmVjMmQ3MGIxZmFlMDg=
2
+ SHA1:
3
+ metadata.gz: f799f6e00792eb7cd781d3b7232a9ae203de6677
4
+ data.tar.gz: 2b251ff94111a8a79d4152876bf46ae7dafe07bb
5
+ SHA512:
6
+ metadata.gz: 6d82478b0ba190503c2e294812ec917c87cd75010725c3b91b60c4ccb0d323ed67ccf9befa5cf8a70b811dc337965d48604c39d6b3c05d86e2af36ce6e83819d
7
+ data.tar.gz: 45ce081a13947296a9d626384fa1321760b001d53008f737ae2cd84cc747f01b9116e9f0f6dde3a40b9680cd5e88b627c8e3d28dc42ee6a73db779e233c2ec14
data/bin/gpig CHANGED
@@ -89,19 +89,26 @@ elsif (!File.exists?(opts.version_file))
89
89
  end
90
90
 
91
91
  str = `git status`
92
- if (!str.index('nothing to commit').nil?)
92
+ no_local_changes = str.include?('nothing to commit')
93
+
94
+ if no_local_changes
93
95
  puts "There aren't any changes in the working directory.\n\n"
94
- exit
96
+ else
97
+ puts "\nAdding files to git repo..."
98
+ `git add -A`
99
+
100
+ puts "\nCommitting files to git repo..."
101
+ `git commit -m "#{opts.message}"`
95
102
  end
96
103
 
97
- puts "\nAdding files to git repo..."
98
- `git add -A`
99
-
100
- puts "\nCommitting files to git repo..."
101
- `git commit -m "#{opts.message}"`
102
-
103
104
  puts "\nPulling in any changes..."
104
- `git pull #{opts.remote} #{opts.branch}`
105
+ str = `git pull #{opts.remote} #{opts.branch}`
106
+ no_remote_changes = str.include?('Already up-to-date.')
107
+
108
+ if no_local_changes && no_remote_changes
109
+ puts "There are no local or remote changes.\n\n"
110
+ exit
111
+ end
105
112
 
106
113
  new_version = false
107
114
  if (opts.increment)
data/lib/gpig/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Gpig
2
- VERSION = '0.0.31'
2
+ VERSION = '0.0.32'
3
3
  end
metadata CHANGED
@@ -1,41 +1,41 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: gpig
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.31
4
+ version: 0.0.32
5
5
  platform: ruby
6
6
  authors:
7
7
  - William Barry
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2013-09-26 00:00:00.000000000 Z
11
+ date: 2016-10-25 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: specific_install
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - ! '>='
17
+ - - ">="
18
18
  - !ruby/object:Gem::Version
19
19
  version: '0'
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - ! '>='
24
+ - - ">="
25
25
  - !ruby/object:Gem::Version
26
26
  version: '0'
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: trollop
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - ! '>='
31
+ - - ">="
32
32
  - !ruby/object:Gem::Version
33
33
  version: '0'
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
- - - ! '>='
38
+ - - ">="
39
39
  - !ruby/object:Gem::Version
40
40
  version: '0'
41
41
  description: A tool to quickly add files to a git repo, push, and then use specific_install
@@ -47,12 +47,12 @@ executables:
47
47
  extensions: []
48
48
  extra_rdoc_files: []
49
49
  files:
50
- - bin/gpig
51
- - lib/gpig/version.rb
52
- - lib/gpig.rb
53
50
  - MIT-LICENSE
54
- - Rakefile
55
51
  - README.md
52
+ - Rakefile
53
+ - bin/gpig
54
+ - lib/gpig.rb
55
+ - lib/gpig/version.rb
56
56
  homepage: http://github.com/williambarry007/gpig
57
57
  licenses: []
58
58
  metadata: {}
@@ -62,17 +62,17 @@ require_paths:
62
62
  - lib
63
63
  required_ruby_version: !ruby/object:Gem::Requirement
64
64
  requirements:
65
- - - ! '>='
65
+ - - ">="
66
66
  - !ruby/object:Gem::Version
67
67
  version: '0'
68
68
  required_rubygems_version: !ruby/object:Gem::Requirement
69
69
  requirements:
70
- - - ! '>='
70
+ - - ">="
71
71
  - !ruby/object:Gem::Version
72
72
  version: '0'
73
73
  requirements: []
74
74
  rubyforge_project:
75
- rubygems_version: 2.0.6
75
+ rubygems_version: 2.5.1
76
76
  signing_key:
77
77
  specification_version: 4
78
78
  summary: A gem development tool.