github_workflow 0.3.2 → 0.3.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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: bb2523c0111941efa0cc2ae28dc02f50f3ae1dd3c2ddd0d15346ab62373e71a1
4
- data.tar.gz: b15ee34fd36a63141439d1cafe92ddbcb48d25651741cffe1e46c04072a23fbe
3
+ metadata.gz: 00fdf33b252e1cbb7f953e344f211cf8867c15005afddc99898416895b9b64cf
4
+ data.tar.gz: 53e614ac7ad8b0fcbab00cabfa4bdf02be7a122b1fe3886e98bdf16a63c709e4
5
5
  SHA512:
6
- metadata.gz: 41d5404c59ed86163d888b7e22c7d2657af520ddbc40d67d5e8c46591cc723dd15d85a7330c0fff110e63c60d228e25b07e192296160be6f4f47c3ed9e72aef2
7
- data.tar.gz: 4e2941bec61a523b28112989de6589dabfa220f1a7813c6e06af8bead84d45a2f0d4b63408a899e1e827631af843f1607c9b37a06bb086b90c1aae4cb1bd4cf5
6
+ metadata.gz: b2356ab260a0829fe6010ee141794783eb75062896d93c6ba448af1716c6345605506b756c7ef921ad29779124b079239493b38b95d60ee02f0031d45a7d31be
7
+ data.tar.gz: 5c086664b84d3fe1013a76028d4308f338636d4c657991c8c2a7c1af37260bc075af46efff76b7b373e7acf094bfd3909ca501d7792df9bc66648c06237b253f
data/.ruby-version CHANGED
@@ -1 +1 @@
1
- 2.7.1
1
+ 2.7.2
@@ -34,7 +34,6 @@ module GithubWorkflow
34
34
  set_trello_card(type: nil)
35
35
  create_issue_from_trello_card
36
36
  stash
37
- checkout_main
38
37
  rebase_main
39
38
  create_branch
40
39
  stash_pop
@@ -48,7 +47,6 @@ module GithubWorkflow
48
47
  set_trello_card(type: :platform)
49
48
  create_issue_from_trello_card
50
49
  stash
51
- checkout_main
52
50
  rebase_main
53
51
  create_branch
54
52
  stash_pop
@@ -59,7 +57,6 @@ module GithubWorkflow
59
57
  def start
60
58
  ensure_github_config_present
61
59
  stash
62
- checkout_main
63
60
  rebase_main
64
61
  create_branch
65
62
  stash_pop
@@ -186,7 +183,7 @@ module GithubWorkflow
186
183
  end
187
184
 
188
185
  def create_branch
189
- `git checkout -b #{branch_name_for_issue_number}`
186
+ `git checkout -b #{branch_name_for_issue_number} main`
190
187
  end
191
188
 
192
189
  def ensure_origin_exists
@@ -362,23 +359,13 @@ module GithubWorkflow
362
359
  def rebase_main
363
360
  say_info("Fetching changes and rebasing main")
364
361
 
365
- if success?("git pull --rebase")
362
+ if success?("git pull origin main:main --rebase")
366
363
  pass("Fetched and rebased")
367
364
  else
368
365
  failure("Failed to fetch or rebase")
369
366
  end
370
367
  end
371
368
 
372
- def checkout_main
373
- say_info("Checking out main")
374
-
375
- if success?("git checkout main")
376
- pass("Checked out main")
377
- else
378
- failure("Failed to checkout main")
379
- end
380
- end
381
-
382
369
  def stash
383
370
  `git diff --quiet`
384
371
 
@@ -1,3 +1,3 @@
1
1
  module GithubWorkflow
2
- VERSION = "0.3.2"
2
+ VERSION = "0.3.3"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: github_workflow
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.3.2
4
+ version: 0.3.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ben Liscio
8
- autorequire:
8
+ autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2021-02-09 00:00:00.000000000 Z
11
+ date: 2021-04-26 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: thor
@@ -114,7 +114,7 @@ dependencies:
114
114
  - - "~>"
115
115
  - !ruby/object:Gem::Version
116
116
  version: '10.0'
117
- description:
117
+ description:
118
118
  email:
119
119
  - bliscio@daisybill.com
120
120
  executables:
@@ -135,7 +135,7 @@ homepage: https://github.com/daisybill/github_workflow
135
135
  licenses:
136
136
  - MIT
137
137
  metadata: {}
138
- post_install_message:
138
+ post_install_message:
139
139
  rdoc_options: []
140
140
  require_paths:
141
141
  - lib
@@ -150,8 +150,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
150
150
  - !ruby/object:Gem::Version
151
151
  version: '0'
152
152
  requirements: []
153
- rubygems_version: 3.1.2
154
- signing_key:
153
+ rubygems_version: 3.1.4
154
+ signing_key:
155
155
  specification_version: 4
156
156
  summary: DaisyBill's internal github workflows
157
157
  test_files: []