martilla 0.4.0.rc1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52022187479500d2fe42d9bbf8153a7383811b06904be9e334a12b6379789ab5
-  data.tar.gz: b19c9c14f59b5bee0db4fc62ef5f1dfc9cbcc01d6ae3bd717e2c59616f6d5292
+  metadata.gz: f0e925d44b622c6e024349755ba2b777d65a29ef03f5a44c478749f0c26022a2
+  data.tar.gz: 603c1c72f5dfaf74c66a634d299379c4ba32829dba17f549a42bf5a193191d5e
 SHA512:
-  metadata.gz: a34c2e035a36c9069d40333b4fd98c377f27d4b0ef6ee467def1983d33a3d0214b8ee659217fd308a5e24b486ba6a7a9377b33138b386d83ff06395727048054
-  data.tar.gz: 38a6e9f03a5b691067d34b8048c1399e627caa469fe3c43c4106abc8f2bbf1b3ed60199afb1483162b76c72d921afd6877b3f05aeb4258d4d87b4d25653dd9ad
+  metadata.gz: 79820251410274f0e945c4ae2d474825622cf68cda0d5a1d7fb1f9a8bbc1cdf53576d46b0e4756e29ec272afce137a0b9beb2eb49667947944c3598124a88bf1
+  data.tar.gz: 4bb017d93cddfbdcb00f7de9df906461eaaf847c01aa43834f239e02c6d798cd9a58552cde20da80910fa940423694b4d4e4744a8c88992203158090fe92be9b

data/.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,33 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Sample config file**
+If possible, a sample config file that is able to reproduce the issue.
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Environment**
+Please complete the following information
+ - OS: [e.g. Debian 9]
+ - Ruby Version [e.g. `ruby --version`]
+ - RVM/rbenv Version [e.g. `rvm -v`]
+
+**Additional context**
+Add any other context about the problem here.

data/.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

data/CONTRIBUTING.md

@@ -0,0 +1,103 @@
+## Contributing
+
+First off, thank you for considering contributing to Martilla.
+
+This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+
+### Where do I go from here?
+
+If you've noticed a bug or have a question [search the issue tracker](https://github.com/fdoxyz/martilla/issues?q=) to see if someone else has already created a ticket. If not, go ahead and create a one[new issue](https://github.com/fdoxyz/martilla/issues/new/choose)!
+
+### Fork & create a branch
+
+If this is something you think you can fix, then [fork Martilla](https://help.github.com/articles/fork-a-repo) and create a branch with a descriptive name.
+
+A good branch name would be (where issue #325 is the ticket you're working on):
+
+```sh
+git checkout -b 325-add-japanese-translations
+```
+
+### Get the test suite running
+
+Make sure you're using a recent ruby and have the `bundler` gem installed, at least version `2.0.2`.
+
+Now install the development dependencies:
+
+```sh
+bundle install
+```
+
+Now you should be able to run the entire suite using:
+
+```sh
+bundle exec rspec
+```
+
+### Implement your fix or feature
+
+At this point, you're ready to make your changes! Feel free to ask for help; everyone is a beginner at first :)
+
+### Get the style right
+
+Your patch should follow the same conventions & pass the same code quality checks as the rest of the project. No linter is set in place at the moment but we're hoping to have one in place.
+
+### Make a Pull Request
+
+At this point, you should switch back to your master branch and make sure it's up to date with Martilla's master branch:
+
+```sh
+git remote add upstream git@github.com:fdoxyz/martilla.git
+git checkout master
+git pull upstream master
+```
+
+Then update your feature branch from your local copy of master, and push it!
+
+```sh
+git checkout 325-add-japanese-translations
+git rebase master
+git push --set-upstream origin 325-add-japanese-translations
+```
+
+Finally, go to GitHub and [make a Pull Request](https://help.github.com/articles/creating-a-pull-request) :D
+
+[Travis CI](https://travis-ci.org/) will run our test suite against all supported Ruby versions. We care about quality, so your PR won't be merged until all tests pass. It's unlikely, but it's possible that your changes pass tests in one Ruby version but fail in another.
+
+### Keeping your Pull Request updated
+
+If a maintainer asks you to "rebase" your PR, they're saying that a lot of code has changed, and that you need to update your branch so it's easier to merge.
+
+To learn more about rebasing in Git, there are a lot of good [git rebasing](http://git-scm.com/book/en/Git-Branching-Rebasing) & [interactive rebase](https://help.github.com/articles/interactive-rebase) resources but here's the suggested workflow:
+
+```sh
+git checkout 325-add-japanese-translations
+git pull --rebase upstream master
+git push --force-with-lease 325-add-japanese-translations
+```
+
+### Merging a PR (maintainers only)
+
+A PR can only be merged into master by a maintainer if:
+
+* It is passing CI.
+* It has no requested changes.
+* It is up to date with current master.
+
+Any maintainer is allowed to merge a PR if all of these conditions are met.
+
+### Shipping a release (maintainers only)
+
+Maintainers need to do the following to push out a release:
+
+* Make sure all pull requests are in and that [changelog](https://github.com/fdoxyz/martilla/blob/master/CHANGELOG.md) is current
+* Update `version.rb` file and changelog with new version number
+* If it's not a patch level release, create a stable branch for that release, otherwise switch to the stable branch corresponding to the patch release you want to ship:
+
+  ```sh
+  bundle install
+  git add .
+  git commit -m "v[X.Y.Z] release"
+  git push origin master
+  rake release
+  ```

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    martilla (0.4.0.rc1)
+    martilla (0.4.0)
       aws-sdk-s3 (~> 1.49)
       aws-sdk-ses (~> 1.26)
       memoist (~> 0.16.0)
@@ -13,17 +13,17 @@ GEM
   remote: https://rubygems.org/
   specs:
     aws-eventstream (1.0.3)
-    aws-partitions (1.237.0)
-    aws-sdk-core (3.76.0)
+    aws-partitions (1.240.0)
+    aws-sdk-core (3.78.0)
       aws-eventstream (~> 1.0, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.228.0)
+      aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
     aws-sdk-kms (1.25.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.53.0)
-      aws-sdk-core (~> 3, >= 3.71.0)
+    aws-sdk-s3 (1.56.0)
+      aws-sdk-core (~> 3, >= 3.77.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
     aws-sdk-ses (1.27.0)

data/README.md

@@ -13,7 +13,6 @@ The name Martilla comes from a local name for the [Kinkajou](https://en.wikipedi
    * [Notifiers](https://github.com/fdoxyz/martilla#notifiers)
    * [Perform a backup](https://github.com/fdoxyz/martilla#perform-a-backup)
 3. [Contributing](https://github.com/fdoxyz/martilla#contributing)
-4. [Development](https://github.com/fdoxyz/martilla#development)
 5. [License](https://github.com/fdoxyz/martilla#license)
 6. [Code of Conduct](https://github.com/fdoxyz/martilla#code-of-conduct)
 
@@ -102,9 +101,7 @@ The available Storages types are **local**, **S3** & **SCP**. They each have dif
      - can be specified with the usual ENV variables or IAM roles
    - `retention`
      - An integer that defines the max number of backups stored at the defined location
-     - **IMPORTANT NOTE:** Releases `v0.3.0` & `v0.3.1` added a bug where the s3 storage option **will possibly delete other files when enforcing retention**. Ways to avoid this problem:
-       - Don't use retention configuration for **s3** storage and wait until a fix is released soon. More details and the status of the issue [here](https://github.com/fdoxyz/martilla/issues/18)
-       - Use a subdirectory within your bucket exclusively for the backups by using the `filename` option to something like `/path/to/backups/backup_name.sql`
+     - **IMPORTANT NOTE:** Releases in `v0.3.x` added a bug where the s3 storage option **might delete other files when enforcing retention**. Make sure you're using `v0.4.x` or newer if you want to enforce a retention limit. More details [here](https://github.com/fdoxyz/martilla/issues/18)
  - options for type: **scp**
    - `filename`
      - The location to where the backup will be stored within remote server
@@ -170,14 +167,10 @@ As simple as running the `backup` command on the martilla CLI and passing as arg
 Help the help command help you
 
     $ martilla help
-    
-## Contributing
-
-Bug reports and pull requests are welcome on GitHub at https://github.com/fdoxyz/martilla. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
-## Development
+## Contributing
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+Check out our [contributing guide](https://github.com/fdoxyz/martilla/blob/master/CONTRIBUTING.md)
 
 ## License
 

data/lib/martilla/utilities.rb

@@ -2,16 +2,16 @@ module Martilla
   class Backup
     module Utilities
       def duration_format(seconds)
-        case seconds
+        case seconds.to_i
         when 0..59
           # 22s
-          "#{seconds}s"
+          "#{seconds.to_i}s"
         when 60..3599
           # 18m 19s
-          "#{s_to_m(seconds)}m #{seconds % 60}s"
+          "#{s_to_m(seconds).to_i}m #{(seconds % 60).to_i}s"
         else
           # 7h 9m 51s
-          "#{s_to_h(seconds)}h #{s_to_m(seconds)}m #{seconds % 60}s"
+          "#{s_to_h(seconds).to_i}h #{s_to_m(seconds).to_i}m #{(seconds % 60).to_i}s"
         end
       end
 

data/lib/martilla/version.rb

@@ -1,3 +1,3 @@
 module Martilla
-  VERSION = '0.4.0.rc1'
+  VERSION = '0.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: martilla
 version: !ruby/object:Gem::Version
-  version: 0.4.0.rc1
+  version: 0.4.0
 platform: ruby
 authors:
 - Fernando Valverde
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-18 00:00:00.000000000 Z
+date: 2019-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -186,11 +186,14 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/ISSUE_TEMPLATE/bug_report.md"
+- ".github/ISSUE_TEMPLATE/feature_request.md"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
+- CONTRIBUTING.md
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -238,9 +241,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.3
 signing_key: