metasploit-model 0.25.1.pre.metasploit.pre.model.pre.search.pre.operator.pre.and.pre.operation.pre.groups-java → 0.25.2-java

Sign up to get free protection for your applications and to get access to all the features.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/CONTRIBUTING.md +162 -0
  3. data/README.md +2 -8
  4. data/lib/metasploit/model/version.rb +1 -3
  5. metadata +5 -4
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 24b1656eeabf3570a4ac4fa0d098ef83c11e76b0
4
- data.tar.gz: 11988ffe6fd9353dd32725bc50073564b6f39c50
3
+ metadata.gz: 97df3e46a6bb66a0b69cc0039734d9552b89181c
4
+ data.tar.gz: 4e43182b1f2b86ef84f9b9f85804209793646525
5
5
  SHA512:
6
- metadata.gz: db564b26dd36ae0a6809912caad1903f18d0b75809690376838e9e7b1499d3e36a437f48d00dcea1442a272e453adb992a05749cd4ab8d5a30ad30d5cc39e782
7
- data.tar.gz: 39daaf69d213de96783bfd14a826cfa7d9ac1f05bdd430b567b6e3ccfadbd72e55390b9c1f115dbc7287d1bb7d1438913095642ee4c9aa712641692c1e43212f
6
+ metadata.gz: ff8eb01d59c592c42cf6268e2dc51659dcfc353a213786524311b9f5021b001b04f39317ebfc616dde76cc9574e93c7aa97d6a9e562bc654151dda584ca3a50d
7
+ data.tar.gz: 19e9bc5315ff7d105e5009ae20fa4459fc1e5a4a56cb50922de7283e4b36b093f41aa5bfb5c41f7d658ec54c8380cec31729034473c03284657e37c04b50e0b1
data/CONTRIBUTING.md ADDED
@@ -0,0 +1,162 @@
1
+ # Contributing
2
+
3
+ ## Forking
4
+
5
+ [Fork this repository](https://github.com/rapid7/metasploit-model/fork)
6
+
7
+ ## Branching
8
+
9
+ Branch names follow the format `TYPE/ISSUE/SUMMARY`. You can create it with `git checkout -b TYPE/ISSUE/SUMMARY`.
10
+
11
+ ### `TYPE`
12
+
13
+ `TYPE` can be `bug`, `chore`, or `feature`.
14
+
15
+ ### `ISSUE`
16
+
17
+ `ISSUE` is either a [Github issue](https://github.com/rapid7/metasploit-model/issues) or an issue from some other
18
+ issue tracking software.
19
+
20
+ ### `SUMMARY`
21
+
22
+ `SUMMARY` is is short summary of the purpose of the branch composed of lower case words separated by '-' so that it is a valid `PRERELEASE` for the Gem version.
23
+
24
+ ## Changes
25
+
26
+ ### `PRERELEASE`
27
+
28
+ 1. Update `PRERELEASE` to match the `SUMMARY` in the branch name. If you branched from `master`, and [version.rb](lib/metasploit/model/version.rb) does not have `PRERELEASE` defined, then adding the following lines after `PATCH`:
29
+ ```
30
+ # The prerelease version, scoped to the {PATCH} version number.
31
+ PRERELEASE = '<SUMMARY>'
32
+ ```
33
+ 2. `rake spec`
34
+ 3. Verify the specs pass, which indicates that `PRERELEASE` was updated correctly.
35
+ 4. Commit the change `git commit -a`
36
+
37
+
38
+ ### Your changes
39
+
40
+ Make your changes or however many commits you like, commiting each with `git commit`.
41
+
42
+ ### Pre-Pull Request Testing
43
+
44
+ 1. Run specs one last time before opening the Pull Request: `rake spec`
45
+ 2. Verify there was no failures.
46
+
47
+ ### Push
48
+
49
+ Push your branch to your fork on gitub: `git push push TYPE/ISSUE/SUMMARY`
50
+
51
+ ### Pull Request
52
+
53
+ * [Create new Pull Request](https://github.com/rapid7/metasploit-model/compare/)
54
+ * Add a Verification Steps comment
55
+
56
+ ```
57
+ # Verification Steps
58
+
59
+ - [ ] `bundle install`
60
+
61
+ ## `rake spec`
62
+ - [ ] `rake spec`
63
+ - [ ] VERIFY no failures
64
+ ```
65
+ You should also include at least one scenario to manually check the changes outside of specs.
66
+
67
+ * Add a Post-merge Steps comment
68
+
69
+ The 'Post-merge Steps' are a reminder to the reviewer of the Pull Request of how to update the [`PRERELEASE`](lib/metasploit/model/version.rb) so that [version_spec.rb](spec/lib/metasploit/model/version_spec.rb) passes on the target branch after the merge.
70
+
71
+ DESTINATION is the name of the destination branch into which the merge is being made. SOURCE_SUMMARY is the SUMMARY from TYPE/ISSUE/SUMMARY branch name for the SOURCE branch that is being made.
72
+
73
+ When merging to `master`:
74
+
75
+ ```
76
+ # Post-merge Steps
77
+
78
+ Perform these steps prior to pushing to master or the build will be broke on master.
79
+
80
+ ## Version
81
+ - [ ] Edit `lib/metasploit/model/version.rb`
82
+ - [ ] Remove `PRERELEASE` and its comment as `PRERELEASE` is not defined on master.
83
+
84
+ ## Gem build
85
+ - [ ] gem build *.gemspec
86
+ - [ ] VERIFY the gem has no '.pre' version suffix.
87
+
88
+ ## RSpec
89
+ - [ ] `rake spec`
90
+ - [ ] VERIFY version examples pass without failures
91
+
92
+ ## Commit & Push
93
+ - [ ] `git commit -a`
94
+ - [ ] `git push origin master`
95
+ ```
96
+
97
+ When merging to DESTINATION other than `master`:
98
+
99
+ ```
100
+ # Post-merge Steps
101
+
102
+ Perform these steps prior to pushing to DESTINATION or the build will be broke on DESTINATION.
103
+
104
+ ## Version
105
+ - [ ] Edit `lib/metasploit/model/version.rb`
106
+ - [ ] Change `PRERELEASE` from `SOURCE_SUMMARY` to `DESTINATION_SUMMARY` to match the branch (DESTINATION) summary (DESTINATION_SUMMARY)
107
+
108
+ ## Gem build
109
+ - [ ] gem build *.gemspec
110
+ - [ ] VERIFY the prerelease suffix has change on the gem.
111
+
112
+ ## RSpec
113
+ - [ ] `rake spec`
114
+ - [ ] VERIFY version examples pass without failures
115
+
116
+ ## Commit & Push
117
+ - [ ] `git commit -a`
118
+ - [ ] `git push origin DESTINATION`
119
+ ```
120
+
121
+ * Add a 'Release Steps' comment
122
+
123
+ The 'Release Steps' are a reminder to the reviewer of the Pull Request of how to release the gem.
124
+
125
+ ```
126
+ # Release
127
+
128
+ Complete these steps on DESTINATION
129
+
130
+ ## Version
131
+
132
+ ### Compatible changes
133
+
134
+ If the change are compatible with the previous branch's API, then increment [`PATCH`](lib/metasploit/model/version.rb).
135
+
136
+ ### Incompatible changes
137
+
138
+ If your changes are incompatible with the previous branch's API, then increment
139
+ [`MINOR`](lib/metasploit/model/version.rb) and reset [`PATCH`](lib/metasploit/model/version.rb) to `0`.
140
+
141
+ - [ ] Following the rules for [semantic versioning 2.0](http://semver.org/spec/v2.0.0.html), update
142
+ [`MINOR`](lib/metasploit/model/version.rb) and [`PATCH`](lib/metasploit/model/version.rb) and commit the changes.
143
+
144
+ ## JRuby
145
+ - [ ] `rvm use jruby@metasploit-model`
146
+ - [ ] `rm Gemfile.lock`
147
+ - [ ] `bundle install`
148
+ - [ ] `rake release`
149
+
150
+ ## MRI Ruby
151
+ - [ ] `rvm use ruby-1.9.3@metasploit-model`
152
+ - [ ] `rm Gemfile.lock`
153
+ - [ ] `bundle install`
154
+ - [ ] `rake release`
155
+ ```
156
+
157
+ ### Downstream dependencies
158
+
159
+ When releasing new versions, the following projects may need to be updated:
160
+
161
+ * [metasploit_data_models](https://github.com/rapid7/metasploit_data_models)
162
+ * [metasploit-credential](https://github.com/rapid7/metasploit-credential)
data/README.md CHANGED
@@ -2,9 +2,7 @@
2
2
 
3
3
  ## Versioning
4
4
 
5
- `Metasploit::Model` is versioned using [semantic versioning 2.0](http://semver.org/spec/v2.0.0.html). Each branch
6
- should set `Metasploit::Model::Version::PRERELEASE` to the branch name, while master should have no `PRERELEASE`
7
- and the `PRERELEASE` section of `Metasploit::Model::VERSION` does not exist.
5
+ `Metasploit::Model` is versioned using [semantic versioning 2.0](http://semver.org/spec/v2.0.0.html). Each branch should set `Metasploit::Model::Version::PRERELEASE` to the branch SUMMARY, while master should have no `PRERELEASE` and the `PRERELEASE` section of `Metasploit::Model::VERSION` does not exist.
8
6
 
9
7
  ## Installation
10
8
 
@@ -26,8 +24,4 @@ TODO: Write usage instructions here
26
24
 
27
25
  ## Contributing
28
26
 
29
- 1. Fork it
30
- 2. Create your feature branch (`git checkout -b my-new-feature`)
31
- 3. Commit your changes (`git commit -am 'Add some feature'`)
32
- 4. Push to the branch (`git push origin my-new-feature`)
33
- 5. Create new Pull Request
27
+ See [CONTRIBUTING.md](CONTRIBUTING.md)
data/lib/metasploit/model/version.rb CHANGED
@@ -7,9 +7,7 @@ module Metasploit
7
7
  # The minor version number, scoped to the {MAJOR} version number.
8
8
  MINOR = 25
9
9
  # The patch number, scoped to the {MINOR} version number.
10
- PATCH = 1
11
- # The prerelease version number, scoped to the {PATCH} version number.
12
- PRERELEASE = 'metasploit-model-search-operator-and-operation-groups'
10
+ PATCH = 2
13
11
 
14
12
  # The full version string, including the {MAJOR}, {MINOR}, {PATCH}, and optionally, the {PRERELEASE} in the
15
13
  # {http://semver.org/spec/v2.0.0.html semantic versioning v2.0.0} format.
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metasploit-model
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.25.1.pre.metasploit.pre.model.pre.search.pre.operator.pre.and.pre.operation.pre.groups
4
+ version: 0.25.2
5
5
  platform: java
6
6
  authors:
7
7
  - Luke Imhoff
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-06-30 00:00:00.000000000 Z
11
+ date: 2014-07-03 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
@@ -93,6 +93,7 @@ files:
93
93
  - .simplecov
94
94
  - .travis.yml
95
95
  - .yardopts
96
+ - CONTRIBUTING.md
96
97
  - Gemfile
97
98
  - LICENSE
98
99
  - README.md
@@ -487,9 +488,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
487
488
  version: '0'
488
489
  required_rubygems_version: !ruby/object:Gem::Requirement
489
490
  requirements:
490
- - - '>'
491
+ - - '>='
491
492
  - !ruby/object:Gem::Version
492
- version: 1.3.1
493
+ version: '0'
493
494
  requirements: []
494
495
  rubyforge_project:
495
496
  rubygems_version: 2.2.2