dotenvious 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ded812743d06ce1ec2fbbdf754845a23d15c89ef
-  data.tar.gz: 5496628b478e37c9950ca4abe035428706a34665
+  metadata.gz: 729dd3bb01a80922fc0db320fcaa80c4c58f269f
+  data.tar.gz: 093d53d8abeb5a7de6fddebe2985cb4a28ddfc5c
 SHA512:
-  metadata.gz: 0cf2b4106f000e56c5c791f04d27c7aea03d02b388847f2209331366923f8c4cff209e9a01192aecebeb98a47d05e5ba43fec3671c117d777ea11ecaf0dc4634
-  data.tar.gz: a709bd2b181c094ff1320e9eec5719be8d032f0a8ef4c69c81d71e20677fdbddb954b84de3b4a0525198db2ea6562c57798c5b7f169692ac61256f0f713fe491
+  metadata.gz: a688ece6d08099e7fba7e527e9400fd4e40cdea906384ae5e1e4c6761bd8396453e487993fe611428d97653893f1e6e88c6de2fad4e07e748a8aa67719e95139
+  data.tar.gz: a5a3969e275bc327de6ad6b1277ba5d0eec0814f9947fafaeb4d71df85113232b02aa4e5d4817bfde9193d394269ce497a992dea3fa722401175a82307758d27

data/dotenvious.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'dotenvious'
-  s.version     = '0.0.4'
-  s.date        = '2016-10-29'
+  s.version     = '0.0.5'
+  s.date        = '2017-01-08'
   s.summary     = "Dotenvious"
   s.description = "A Gem to manage environment variables"
   s.authors     = ["Jake Faris"]

data/lib/dotenvious/cli/env_file_consolidator.rb

@@ -6,9 +6,13 @@ require_relative '../loaders/configuration'
 module Dotenvious
   module CLI
     class EnvFileConsolidator
+      def initialize(options = {})
+        @example_file = options[:example_file]
+      end
+
       def run
         Loaders::Configuration.new.load
-        Loaders::Environments.new.load_envs
+        Loaders::Environments.new({example_file: example_file}).load_environments
         unless all_vars_present? && all_vars_match?
           alert_user
           decision = STDIN.gets.strip
@@ -18,7 +22,7 @@ module Dotenvious
 
       private
 
-      attr_reader :filename
+      attr_reader :example_file, :filename
 
       def alert_user
         puts "You have missing ENV variables. Examime them? [y/n]"

data/lib/dotenvious/cli/env_file_sorter.rb

@@ -1,11 +1,7 @@
-require_relative '../loaders/env'
-
 module Dotenvious
   module CLI
     class EnvFileSorter
       def run
-        Loaders::Env.new.load
-        puts "Sorting..."
         File.open('.env', 'w') do |file|
           file.write(sorted_env_text)
         end

data/lib/dotenvious/cli/main.rb

@@ -1,25 +1,47 @@
+require 'optparse'
 require_relative 'env_file_consolidator'
 require_relative 'env_file_sorter'
 
 module Dotenvious
   module CLI
     class Main
+      def initialize
+        @options = {}
+      end
+
       def run
-        if ARGV[0].to_s.empty?
-          EnvFileConsolidator.new.run
-        elsif ARGV[0].to_s == '--sort'
-          EnvFileSorter.new.run
-        else
-          ask_user_to_remove_flags
-        end
+        parse_options
+        EnvFileConsolidator.new({example_file: options[:file]}).run
+        EnvFileSorter.new.run if options[:sort]
       end
 
       private
 
-      attr_reader :filename
+      attr_accessor :options
+
+      def parse_options
+        parser = OptionParser.new do |opts|
+          opts.banner = "How to use Dotenvious:"
+
+          opts.on('-f .example-environment-file', '--file .example-environment-file', 'Specify which example file to use') do |file|
+            options[:file] = file
+          end
 
-      def ask_user_to_remove_flags
-        puts "dotenvious does not have flags at this time. Run 'dotenvious' without flags to get the main functionality."
+          opts.on('-s', '--sort', 'Sort .env file by key names alphabetically') do
+            options[:sort] = true
+          end
+
+          opts.on('-h', '--help', 'View this message') do
+            puts opts
+            exit
+          end
+        end
+
+        begin
+          parser.parse!
+        rescue OptionParser::InvalidOption => e
+          puts "Warning #{e}"
+        end
       end
     end
   end

data/lib/dotenvious/loaders/{environment.rb → dotenv_file.rb}

@@ -1,31 +1,35 @@
 module Dotenvious
   module Loaders
-    class Environment
+    class DotenvFile
+      def self.load_from(filename)
+        new(filename).load
+      end
+
+      def initialize(filename)
+        @filename = filename
+      end
+
       def load
         #took from Dotenv source code whoops
         if file_missing?
           puts "This repo does not have an #{filename} file"
-          return
+          return {}
         end
-        file.each do |line|
-          environment[$1] = $2 if line =~ /\A([\w_]+)=(.*)\z/
+        Hash.new.tap do |environment|
+          file.each do |line|
+            environment[$1] = $2 if line =~ /\A([\w_]+)=(.*)\z/
+          end
         end
       end
 
       private
 
+      attr_reader :filename
+
       def file_missing?
         !File.exists?(filename)
       end
 
-      def environment
-        raise "environment must be defined in child class"
-      end
-
-      def filename
-        raise "fileame must be defined in child class"
-      end
-
       def file
         File.read(filename).split("\n")
       end

data/lib/dotenvious/loaders/environments.rb

@@ -1,13 +1,20 @@
-require_relative 'example'
-require_relative 'env'
+require_relative 'dotenv_file'
 
 module Dotenvious
   module Loaders
     class Environments
-      def load_envs
-        Env.new.load
-        Example.new.load
+      def initialize(options = {})
+        @example_file = options[:example_file] || DEFAULT_EXAMPLE_ENV_FILE
       end
+
+      def load_environments
+        ENV.merge!(DotenvFile.load_from('.env'))
+        ENV_EXAMPLE.merge!(DotenvFile.load_from(example_file))
+      end
+
+      private
+
+      attr_reader :example_file
     end
   end
 end

data/spec/dotenvious/cli/env_file_consolidator_spec.rb

@@ -2,19 +2,19 @@ require 'spec_helper'
 
 describe Dotenvious::CLI::EnvFileConsolidator do
   describe '.new' do
-    xit 'determines the correct file to use as example' do
-      # future release work
+    it 'takes option hash' do
+      expect { described_class.new({example_file: '.envenvenv'}) }.to_not raise_error
     end
   end
 
   describe '#run' do
-    context 'with no flags' do
+    context 'without options' do
       before do
         allow(File).to receive(:read).and_return("")
       end
 
       it 'loads the environment & example environment variables' do
-        expect_any_instance_of(Dotenvious::Loaders::Environments).to receive(:load_envs)
+        expect_any_instance_of(Dotenvious::Loaders::Environments).to receive(:load_environments)
 
         described_class.new.run
       end
@@ -51,5 +51,16 @@ describe Dotenvious::CLI::EnvFileConsolidator do
         end
       end
     end
+
+    context 'given an option hash with :example_file' do
+      it 'loads environments with that example_file' do
+        environments_double = double
+        expect(Dotenvious::Loaders::Environments).to receive(:new)
+          .with({example_file: '.test.env.test'}).and_return(environments_double)
+        expect(environments_double).to receive(:load_environments)
+
+        described_class.new({example_file: '.test.env.test'}).run
+      end
+    end
   end
 end

data/spec/dotenvious/cli/env_file_sorter_spec.rb

@@ -3,8 +3,6 @@ require 'spec_helper'
 describe Dotenvious::CLI::EnvFileSorter do
   describe '#run' do
     it "sorts the key-value pairs back into .env" do
-      expect_any_instance_of(Dotenvious::Loaders::Env).to receive(:load).and_return true
-
       stub_const('Dotenvious::ENV', {'TEST' => 'same', 'ABC' => '123'} )
 
       fake_file = double

data/spec/dotenvious/cli/main_spec.rb

@@ -15,14 +15,47 @@ describe Dotenvious::CLI::Main do
     end
 
     context 'when option flags are given' do
-      before do
-        stub_const('ARGV', ['--test'])
+      context 'and the flag is not implemented' do
+        before do
+          stub_const('ARGV', ['--test'])
+        end
+
+        it 'ignores the flag and runs main process' do
+          expect_any_instance_of(Dotenvious::CLI::EnvFileConsolidator).to receive(:run)
+
+          described_class.new.run
+        end
       end
 
-      it 'tells the user to try again without flags' do
-        expect_any_instance_of(described_class).to receive(:ask_user_to_remove_flags)
+      context 'and the flag is implemented' do
+        context '--sort' do
+          before do
+            stub_const('ARGV', ['--sort'])
+          end
 
-        described_class.new.run
+          it 'runs EnvFileSorter after main process' do
+            expect_any_instance_of(Dotenvious::CLI::EnvFileConsolidator).to receive(:run)
+            expect_any_instance_of(Dotenvious::CLI::EnvFileSorter).to receive(:run)
+
+            described_class.new.run
+          end
+        end
+
+        context '--file' do
+          before do
+            stub_const('ARGV', ['--file', '.my-test-file-env'])
+          end
+
+          it 'uses the user-specified filename to read example environment' do
+            fake_consolidator = double
+            expect(fake_consolidator).to receive(:run)
+            expect(Dotenvious::CLI::EnvFileConsolidator).to receive(:new)
+              .with({example_file: '.my-test-file-env'})
+              .and_return(fake_consolidator)
+
+            described_class.new.run
+          end
+        end
       end
     end
   end

data/spec/dotenvious/loaders/dotenv_file_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+describe Dotenvious::Loaders::DotenvFile do
+  describe '.load_from' do
+    context 'given a file which does not exist' do
+      before do
+        expect(File).to receive(:exists?).and_return false
+      end
+      it 'aborts the process' do
+        described_class.load_from('.env')
+      end
+    end
+
+    context 'given a file which exists' do
+      before do
+        expect(File).to receive(:exists?).and_return true
+      end
+
+      it 'reads the given Dotenv format file and returns hash' do
+        expect(File).to receive(:read).and_return "TEST=123\nEXAMPLE=234"
+
+        response = described_class.load_from('.env')
+
+        expect(response['TEST']).to eq '123'
+        expect(response['EXAMPLE']).to eq '234'
+      end
+    end
+  end
+end

data/spec/dotenvious/loaders/environments_spec.rb

@@ -1,12 +1,29 @@
 require 'spec_helper'
 
 describe Dotenvious::Loaders::Environments do
-  describe '#load_envs' do
-    it 'loads from Dotenv as well as Loaders::Example' do
-      expect_any_instance_of(Dotenvious::Loaders::Example).to receive(:load)
-      expect_any_instance_of(Dotenvious::Loaders::Env).to receive(:load)
+  describe '#new' do
+    it 'takes options hash' do
+      expect{ described_class.new({example_file: '.my.example.file'}) }.to_not raise_error
+    end
+  end
+
+  describe '#load_environments' do
+    context 'without user-specified example file' do
+      it 'loads from Dotenv as well as Loaders::Example' do
+        expect(Dotenvious::Loaders::DotenvFile).to receive(:load_from).with('.env').and_return({})
+        expect(Dotenvious::Loaders::DotenvFile).to receive(:load_from).with('.example-env').and_return({})
+
+        described_class.new.load_environments
+      end
+    end
+
+    context 'with user-specified example file' do
+      it 'loads that example environment' do
+        expect(Dotenvious::Loaders::DotenvFile).to receive(:load_from).with('.env').and_return({})
+        expect(Dotenvious::Loaders::DotenvFile).to receive(:load_from).with('.my.example.file').and_return({})
 
-      described_class.new.load_envs
+        described_class.new({example_file: '.my.example.file'}).load_environments
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dotenvious
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Jake Faris
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-29 00:00:00.000000000 Z
+date: 2017-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,10 +72,8 @@ files:
 - lib/dotenvious/configuration.rb
 - lib/dotenvious/env_appender.rb
 - lib/dotenvious/loaders/configuration.rb
-- lib/dotenvious/loaders/env.rb
-- lib/dotenvious/loaders/environment.rb
+- lib/dotenvious/loaders/dotenv_file.rb
 - lib/dotenvious/loaders/environments.rb
-- lib/dotenvious/loaders/example.rb
 - lib/dotenvious/mismatched_variable_finder.rb
 - lib/dotenvious/missing_variable_finder.rb
 - lib/dotenvious/prompter.rb
@@ -86,9 +84,8 @@ files:
 - spec/dotenvious/configuration_spec.rb
 - spec/dotenvious/env_appender_spec.rb
 - spec/dotenvious/loaders/configuration_spec.rb
-- spec/dotenvious/loaders/env_spec.rb
+- spec/dotenvious/loaders/dotenv_file_spec.rb
 - spec/dotenvious/loaders/environments_spec.rb
-- spec/dotenvious/loaders/example_spec.rb
 - spec/dotenvious/mismatched_variable_finder_spec.rb
 - spec/dotenvious/missing_variable_finder_spec.rb
 - spec/dotenvious/prompter_spec.rb

data/lib/dotenvious/loaders/env.rb

@@ -1,15 +0,0 @@
-module Dotenvious
-  module Loaders
-    class Env < Environment
-      private
-
-      def filename
-        DEFAULT_ENV_FILE
-      end
-
-      def environment
-        Dotenvious::ENV
-      end
-    end
-  end
-end

data/lib/dotenvious/loaders/example.rb

@@ -1,17 +0,0 @@
-require_relative 'environment'
-
-module Dotenvious
-  module Loaders
-    class Example < Environment
-      private
-
-      def filename
-        DEFAULT_EXAMPLE_ENV_FILE
-      end
-
-      def environment
-        Dotenvious::ENV_EXAMPLE
-      end
-    end
-  end
-end

data/spec/dotenvious/loaders/env_spec.rb

@@ -1,34 +0,0 @@
-require 'spec_helper'
-
-describe Dotenvious::Loaders::Env do
-  describe '#load' do
-    context 'when .env are not present' do
-      before do
-        expect(File).to receive(:exists?).and_return false
-      end
-      it 'aborts the process' do
-        described_class.new.load
-      end
-    end
-
-    context 'when .env is present' do
-      before do
-        expect(File).to receive(:exists?).and_return true
-      end
-      it 'loads files from .env' do
-        expect(File).to receive(:read).with('.env').and_return ""
-
-        described_class.new.load
-      end
-
-      it 'passes those arguments to Dotenvious::ENV_EXAMPLE' do
-        expect(File).to receive(:read).and_return "TEST=123\nEXAMPLE=234"
-
-        described_class.new.load
-
-        expect(Dotenvious::ENV['TEST']).to eq '123'
-        expect(Dotenvious::ENV['EXAMPLE']).to eq '234'
-      end
-    end
-  end
-end

data/spec/dotenvious/loaders/example_spec.rb

@@ -1,37 +0,0 @@
-require 'spec_helper'
-
-describe Dotenvious::Loaders::Example do
-  describe '#load' do
-    context 'when example-env does not exist' do
-      before do
-        expect(File).to receive(:exists?).and_return false
-      end
-
-      it 'aborts the process' do
-        described_class.new.load
-      end
-    end
-
-    context 'when example-env exists' do
-      before do
-        expect(File).to receive(:exists?).and_return true
-        stub_const('Dotenvious::DEFAULT_EXAMPLE_ENV_FILE', '.example-env')
-      end
-
-      it 'loads files from Dotenvious::DEFAULT_EXAMPLE_ENV_FILE' do
-        expect(File).to receive(:read).with('.example-env').and_return ""
-
-        described_class.new.load
-      end
-
-      it 'passes those arguments to Dotenvious::ENV_EXAMPLE' do
-        expect(File).to receive(:read).and_return "TEST=123\nEXAMPLE=234"
-
-        described_class.new.load
-
-        expect(Dotenvious::ENV_EXAMPLE['TEST']).to eq '123'
-        expect(Dotenvious::ENV_EXAMPLE['EXAMPLE']).to eq '234'
-      end
-    end
-  end
-end