vars 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d4a8ae7877bcc6826a494fa4b95ea5af03c7599bd8f6d58485d19936d8d0ded
-  data.tar.gz: d1846e487a43c1462c53239ed2e5c5fe330ffd1b42da756dd6df314a3b6f2b34
+  metadata.gz: f089dad07e951ae88cd1d8e9c69bf0aa25d2c3f344ddeed6a78879609d8bb69f
+  data.tar.gz: 57558dd28e1d9a36bf716dccab2afc708e7f6b61318492a2dd401458ff462580
 SHA512:
-  metadata.gz: '028832d7dbe69ff29befe22a517df5e6c97d7e2242c7e2b80e95f0279948972ca96bff83521b6627052df28f6a8ce165fba96e7f63b69f85add58c8ced4da0a7'
-  data.tar.gz: 7cf14a3ae4efb5eadcad03fce70b521c9e5ea0581a3c6822ce567384081fe7636a27aa93edb799f26fff73b46c3cd99ceaa62ed3dbf2225775b2c5b02f08391a
+  metadata.gz: d0055ac7e2c385f51c6ee41d3151c91c65f5db769b143198d513c55f74caecd781ef4abb60782dc78a061ca581eeff5a7d56b8fe8a619a11cbb8b22c99e5c84b
+  data.tar.gz: beaa4187761f12c02c2bbb54f5daf0159efd041746618d98518d56c5ba1c8052ff9c4a330dff06106700e2725a6c4f0799cf845ccaed57648f6952c78ad6b020

data/.travis.yml

@@ -3,3 +3,6 @@ language: ruby
 rvm:
   - 2.5.1
 before_install: gem install bundler -v 1.16.2
+script:
+  - bundle exec rake test
+  - bundle exec rubocop

data/README.md

@@ -1,5 +1,7 @@
 # Vars
 
+[![Build Status](https://travis-ci.org/i2bskn/vars.svg?branch=master)](https://travis-ci.org/i2bskn/vars)
+
 `vars` is provide configuration each environments.
 
 ## Installation
@@ -23,7 +25,10 @@ vars = Vars.new(path: "path/to/environment.yml", name: "production")
 vars.rails_env # => "production"
 vars.app_root  # => "/var/www/app/current"
 
-vars.resolve_template("path/to/template.erb", "path/to/dest_file") # Create file from template.
+# Create config/database.yml from template.
+vars.resolve_template("config/deploy/templates/database.yml.erb", "config/database.yml")
+
+# Create config files from templates. (config/deploy/templates/**/*)
 vars.resolve_templates("config/deploy/templates", "config")
 ```
 
@@ -35,9 +40,16 @@ default:
   app_root: /var/www/app/current
   db_host: localhost
 
+development:
+  db_host: app-development-db-01.xxx.ap-northeast-1.rds.amazonaws.com
+
+staging:
+  rails_env: staging
+  db_host: app-staging-db-01.xxx.ap-northeast-1.rds.amazonaws.com
+
 production:
   rails_env: production
-  db_host: app-db-01.cluster.ap-northeast-1.rds.amazonaws.com
+  db_host: app-db-01.xxx.ap-northeast-1.rds.amazonaws.com
 ```
 
 ## Development

data/lib/vars/options.rb

@@ -5,17 +5,21 @@ class Vars
     module Defaults
       BRANCH      = "master".freeze
       ENV_NAME    = "development".freeze
+      REMOTE_NAME = "origin".freeze
       SOURCE_PATH = "config/vars.yml".freeze
       SOURCE_TYPE = :path
     end
 
     module EnvKeys
-      BRANCH   = "TARGET_BRANCH".freeze
-      ENV_NAME = "APP_ENV".freeze
+      BRANCH      = "TARGET_BRANCH".freeze
+      ENV_NAME    = "APP_ENV".freeze
+      REMOTE_NAME = "REMOTE_NAME".freeze
     end
 
     def initialize(opts = {})
       @opts = opts.transform_keys(&:to_sym)
+      # Use only when source_type is git.
+      @need_fetch = true
     end
 
     def hash(reload = false)
@@ -25,6 +29,8 @@ class Vars
 
     def load_source
       src = YAML.safe_load(ERB.new(raw_source, nil, "-").result(Class.new.__binding__), [], [], true)
+      return {} if src.nil?
+
       src.fetch("default", {}).merge(src.fetch(name.to_s))
     end
 
@@ -33,35 +39,40 @@ class Vars
     end
 
     def repo_path
-      case
-      when opts.key?(:repo_path)
-        opts.fetch(:repo_path)
-      when in_repository?
-        opts[:repo_path] = capture("git rev-parse --show-toplevel")
-      else
-        nil
-      end
+      return opts.fetch(:repo_path) if opts.key?(:repo_path)
+      return nil unless in_repository?
+
+      opts[:repo_path] = capture("git rev-parse --show-toplevel")
     end
 
     def branch
-      case
-      when opts.key?(:branch)
-        opts.fetch(:branch)
-      when ENV.key?(EnvKeys::BRANCH)
+      return opts.fetch(:branch) if opts.key?(:branch)
+
+      if ENV.key?(EnvKeys::BRANCH)
         opts[:branch] = ENV.fetch(EnvKeys::BRANCH)
-      when in_repository?
+      elsif in_repository?
         opts[:branch] = capture("git symbolic-ref --short HEAD")
       else
         Defaults::BRANCH
       end
     end
 
+    def remote_name
+      ENV.fetch(EnvKeys::REMOTE_NAME, Defaults::REMOTE_NAME)
+    end
+
     def source_type
       opts.fetch(:source_type, Defaults::SOURCE_TYPE)
     end
 
     def in_repository?
       opts[:in_repository] = success?("git rev-parse --git-dir") unless opts.key?(:in_repository)
+      # Update remote repositories.
+      if opts[:in_repository] && @need_fetch
+        execute("git fetch #{remote_name}")
+        @need_fetch = false
+      end
+
       opts.fetch(:in_repository)
     end
 
@@ -75,7 +86,7 @@ class Vars
         when :path
           File.read(path)
         when :git
-          Dir.chdir(repo_path) { capture("git show #{branch}:#{path}") }
+          Dir.chdir(repo_path) { capture("git show #{remote_name}/#{branch}:#{path}") }
         else
           raise "unknown source_type: #{source_type}"
         end

data/lib/vars/version.rb

@@ -1,3 +1,3 @@
 class Vars
-  VERSION = "0.0.4".freeze
+  VERSION = "0.0.5".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vars
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - i2bskn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-20 00:00:00.000000000 Z
+date: 2018-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler