jipcode 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f71f6e964a7ec6494af9b55e2b491822eaadff57a975159c8633f7ea73e2da86
-  data.tar.gz: ca76eac237ad81df1012f34b2641a108ae6f18bd2167644c7dfe9d35e86e0824
+  metadata.gz: 8ec82fe85a327e6041d9fbef9e41c7a2b3dc01918fb3de01bdecd2438b2a5d40
+  data.tar.gz: 3488fa356bcba342ae1737a7d478334b156ffa8f69403c8aff1db7ba5f521a4d
 SHA512:
-  metadata.gz: 3dca4c5f89c46bbb5e9f39f89eebb003cd0d39a74fcd2eec646d34794c9d5d275c3e6ec2346274b37e85bd91ac0b1cb0dbee4cee21f1b4f5e210ffd91c983f44
-  data.tar.gz: fee5254f728ed78bd426b19f64675f882c49f7f5555c12d954cd1fc6cede239feb96dd1e66bbff926489378ce8a61c17b955e9265df80c4d668d0f3145456b3d
+  metadata.gz: f01ae602dae3b1148fc92f2ed303ac8bf95dc860cade344d72f75481df9e0a55373c656d070bdf4d9bc7b20806997b7ed03324c5372410884f9e534311569b4d
+  data.tar.gz: a76cef079d6317536b31cb0fa09f3d143137349347b832b19dcf00bb549f92be343c7ba8c29ae97f70402e40a908b1f88e35aa4fe7b43d5721f2d082aefb6822

data/.travis.yml

@@ -2,7 +2,12 @@ sudo: false
 language: ruby
 rvm:
   - 2.5.0
-before_install: gem install bundler -v 1.16.1
+before_install:
+  - openssl aes-256-cbc -K $encrypted_3597653ee3ea_key -iv $encrypted_3597653ee3ea_iv -in .travis_rsa.enc -out ~/.ssh/id_rsa -d
+  - chmod 600 ~/.ssh/id_rsa
+  - git remote set-url origin git@github.com:rinkei/jipcode.git
+  - gem install bundler -v 1.16.1
+install: bundle install --jobs=3 --retry=3
 script:
-  - if [ "$TRAVIS_EVENT_TYPE" = "cron" ]; then bin/update; fi
+  - bin/update
   - bundle exec rake spec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    jipcode (1.3.1)
+    jipcode (1.4.0)
 
 GEM
   remote: https://rubygems.org/

data/bin/update

@@ -1,11 +1,24 @@
 #!/usr/bin/env bash
 
+# 最後のデータ更新月が現在の月ならば実行しない
+if [ `cat zipcode/current_month` = `date "+%Y%m"` ]; then
+  exit 0
+fi
+
+git checkout master
+
 bundle exec rake update
-git add zipcode/latest
+# rake updateが何らかの理由で失敗したらエラーとして終了
+if [ $? = "1" ]; then
+  exit 1
+fi
+
+git add zipcode/latest zipcode/current_month
 
-if git commit -m '最新の郵便番号データに更新'; then
-  bundle exec bump patch -m '郵便番号データの更新に伴うアップデート'
+if git commit -m `date "+%Y年%m月%d日現在の郵便番号データに更新"`; then
+  bundle exec bump patch --no-commit
+  git add Gemfile.lock lib/jipcode/version.rb
+  git commit -m "バージョンを`bundle exec bump current | sed -e "s/^\(.*: \)//"`に更新"
 
   git push origin master
-  bundle exec rake release
 fi

data/lib/jipcode/japan_post.rb

@@ -18,6 +18,9 @@ module Jipcode
     def update
       download_all
       import_all
+
+      # データの更新月を記録する
+      File.open('zipcode/current_month', 'w') { |f| f.write(Time.now.strftime('%Y%m')) }
     end
 
     def download_all

data/lib/jipcode/version.rb

@@ -1,3 +1,3 @@
 module Jipcode
-  VERSION = '1.3.1'
+  VERSION = '1.4.0'
 end

data/zipcode/current_month

@@ -0,0 +1 @@
+201810

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jipcode
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - rinkei
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-01 00:00:00.000000000 Z
+date: 2018-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -118,6 +118,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- ".travis_rsa.enc"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock
@@ -131,6 +132,7 @@ files:
 - lib/jipcode.rb
 - lib/jipcode/japan_post.rb
 - lib/jipcode/version.rb
+- zipcode/current_month
 - zipcode/latest/001.csv
 - zipcode/latest/002.csv
 - zipcode/latest/003.csv