enfcli 3.3.2.pre.alpha → 3.3.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/.circleci/build.sh +20 -20
  3. data/.circleci/config.yml +44 -24
  4. data/Gemfile.lock +3 -3
  5. data/lib/enfcli/version.rb +1 -1
  6. metadata +4 -4
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: a951559fe54c801146be2c17e70ea4b9f5670da39b65f0c13ae107c8cc371a92
4
- data.tar.gz: 4bc2c37098d5349ab7b42636cf12472dd6caf4d0c64236f317f5bba4f28ba80a
3
+ metadata.gz: cde8a30c8bdbb871c3be989abc95ca66a2761c1b97e3f77fc0a791692a28bc8a
4
+ data.tar.gz: ac718a7995b65d0fc361c71923f0046461107fcdc40eb9a30c8098b309b0bc00
5
5
  SHA512:
6
- metadata.gz: 5285878f1c81050b85b4c4be54f0f381e5af983f169177adb91cf3e0d1027e09d15df0f1ddae350bd572f7b1e5ca87b7bf0a06896aa93990a2914e928039de80
7
- data.tar.gz: 6cb15d266857da2b399a216f5170da84672d3999b5cd81a2e50298fdee0afc4514cbce28097e98d192adf0241ac7d78efe509b7cbca5ecb458515b66cec9f7bc
6
+ metadata.gz: 0ed0d004580c34c23a838caf3a2304512296d13e2bc64d83624d4a90001c93d8306eaaeefea67f21ac7e5565dc020ad5e877023d6238bbd9c4278b3cab74a306
7
+ data.tar.gz: 4fec2cb2f48f8c0924f2e61bf0d1a0779c5858d921249733d7956f5325f05ac147512a9cebe602dbee8b58c62f01e853783678fba5a9e0951dfa14c22e31e160
data/.circleci/build.sh CHANGED
@@ -3,7 +3,7 @@
3
3
  set -e
4
4
 
5
5
  RELEASE_VSN_REGEX=[0-9]+.[0-9]+.[0-9]+$
6
- PRE_VSN_REGEX=[0-9]+.[0-9]+.[0-9]+-[a-z]+$
6
+ PRE_VSN_REGEX=[0-9]+.[0-9]+.[0-9]+.pre.[a-z]+$
7
7
 
8
8
  branch() {
9
9
  # Check if branch name comes for drone
@@ -29,37 +29,37 @@ match() {
29
29
  fi
30
30
  }
31
31
 
32
-
33
-
34
- validate_version() {
35
- local vsn=$(version)
36
-
37
- if [ "X${CIRCLE_TAG}" == X ]; then
38
- # Tag is empty. Ensure pre-relase
39
- match ${vsn} ${PRE_VSN_REGEX}
32
+ push_gem() {
33
+ local type=$1
34
+ local vsn=$2
35
+ local regex=$3
36
+
37
+ if [[ ${vsn} =~ ${regex} ]]; then
38
+ gem push pkg/enfcli-${vsn}.gem
40
39
  else
41
- match ${vsn} ${RELEASE_VSN_REGEX}
40
+ echo "Cannot publish ${type} for ${vsn}"
42
41
  fi
43
42
  }
44
43
 
45
44
  deploy_gem() {
46
- local vsn=$(version | sed -e 's/-/\.pre\./')
47
-
48
- if [ "X${CIRCLE_PROJECT_USERNAME}" == Xxaptum ]; then
49
- gem push pkg/enfcli-${vsn}.gem
45
+ if [ "X${CIRCLE_TAG}" == X ]; then
46
+ # Tag is empty. Ensure pre-relase
47
+ local pre=$(version | sed -e 's/-/\.pre\./')
48
+ push_gem 'PRE-RELEASE' ${pre} ${PRE_VSN_REGEX}
50
49
  else
51
- echo "Cannot deploy gem for ${CIRCLE_PROJECT_USERNAME}"
50
+ local vsn=$(version)
51
+ push_gem 'RELEASE' ${vsn} ${RELEASE_VSN_REGEX}
52
52
  fi
53
53
  }
54
54
 
55
55
  main() {
56
56
  case $1 in
57
- validate)
58
- validate_version
59
- ;;
60
-
61
57
  deploy)
62
- deploy_gem
58
+ if [ "X${CIRCLE_PROJECT_USERNAME}" == Xxaptum ]; then
59
+ deploy_gem
60
+ else
61
+ echo "Cannot deploy gem for ${CIRCLE_PROJECT_USERNAME}"
62
+ fi
63
63
  ;;
64
64
 
65
65
  *)
data/.circleci/config.yml CHANGED
@@ -3,6 +3,26 @@
3
3
  # Check https://circleci.com/docs/2.0/language-ruby/ for more details
4
4
  #
5
5
  version: 2
6
+
7
+ # aliases
8
+ release_steps: &release_steps
9
+ steps:
10
+ - checkout
11
+
12
+ - run:
13
+ name: Setup Rubygems
14
+ command: |
15
+ .circleci/setup-rubygems.sh
16
+
17
+ - attach_workspace:
18
+ at: ~/enfcli
19
+
20
+ - run:
21
+ name: deploy to rubygems
22
+ command: |
23
+ .circleci/build.sh deploy
24
+
25
+ # Jobs
6
26
  jobs:
7
27
  build:
8
28
  docker:
@@ -29,12 +49,6 @@ jobs:
29
49
  - ./vendor/bundle
30
50
  key: v1-dependencies-{{ checksum "Gemfile.lock" }}
31
51
 
32
- # Validate version
33
- - run:
34
- name: validate enfcli gem version
35
- command: |
36
- .circleci/build.sh validate
37
-
38
52
  # run tests!
39
53
  - run:
40
54
  name: run tests
@@ -66,28 +80,21 @@ jobs:
66
80
  paths:
67
81
  - pkg
68
82
 
69
- # Deploy job
70
- deploy:
83
+ # release job
84
+ release:
71
85
  docker:
72
86
  - image: xaptumeng/enfcli-build
73
87
 
74
88
  working_directory: ~/enfcli
89
+ <<: *release_steps
75
90
 
76
- steps:
77
- - checkout
78
-
79
- - run:
80
- name: Setup Rubygems
81
- command: |
82
- .circleci/setup-rubygems.sh
83
-
84
- - attach_workspace:
85
- at: ~/enfcli
91
+ # pre-release job
92
+ pre_release:
93
+ docker:
94
+ - image: xaptumeng/enfcli-build
86
95
 
87
- - run:
88
- name: deploy to rubygems
89
- command: |
90
- .circleci/build.sh deploy
96
+ working_directory: ~/enfcli
97
+ <<: *release_steps
91
98
 
92
99
  # Workflows
93
100
  workflows:
@@ -96,13 +103,26 @@ workflows:
96
103
  jobs:
97
104
  - build:
98
105
  context: gems.xaptum.xyz
99
-
100
- - deploy:
106
+ filters:
107
+ branches:
108
+ only: /.*/
109
+ tags:
110
+ only: /.*/
111
+
112
+ - release:
101
113
  context: gems.xaptum.xyz
102
114
  requires:
103
115
  - build
104
116
  filters:
117
+ branches:
118
+ ignore: /.*/
105
119
  tags:
106
120
  only: /.*/
121
+
122
+ - pre_release:
123
+ context: gems.xaptum.xyz
124
+ requires:
125
+ - build
126
+ filters:
107
127
  branches:
108
128
  only: master
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- enfcli (3.3.2.pre.alpha)
4
+ enfcli (3.3.3)
5
5
  rest-client (~> 2.0)
6
6
  terminal-table
7
7
  thor (~> 0.20.0)
@@ -25,7 +25,7 @@ GEM
25
25
  domain_name (~> 0.5)
26
26
  mime-types (3.2.2)
27
27
  mime-types-data (~> 3.2015)
28
- mime-types-data (3.2018.0812)
28
+ mime-types-data (3.2019.0331)
29
29
  netrc (0.11.0)
30
30
  public_suffix (3.0.3)
31
31
  rake (10.5.0)
@@ -56,7 +56,7 @@ GEM
56
56
  unf (0.1.4)
57
57
  unf_ext
58
58
  unf_ext (0.0.7.5)
59
- unicode-display_width (1.4.0)
59
+ unicode-display_width (1.5.0)
60
60
  vcr (4.0.0)
61
61
  webmock (3.4.2)
62
62
  addressable (>= 2.3.6)
data/lib/enfcli/version.rb CHANGED
@@ -14,5 +14,5 @@
14
14
  # limitations under the License.
15
15
  #
16
16
  module EnfCli
17
- VERSION = '3.3.2-alpha'
17
+ VERSION = '3.3.3'
18
18
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: enfcli
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.3.2.pre.alpha
4
+ version: 3.3.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Venkatakumar Srinivasan
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2019-03-29 00:00:00.000000000 Z
11
+ date: 2019-04-05 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: thor
@@ -207,9 +207,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
207
207
  version: '0'
208
208
  required_rubygems_version: !ruby/object:Gem::Requirement
209
209
  requirements:
210
- - - ">"
210
+ - - ">="
211
211
  - !ruby/object:Gem::Version
212
- version: 1.3.1
212
+ version: '0'
213
213
  requirements: []
214
214
  rubygems_version: 3.0.1
215
215
  signing_key: