vscripts 0.1.3 → 0.1.5

data/spec/unit/vscripts/aws/ec2_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'aws_spec_helper'
 require 'vscripts/aws'
 
 describe VScripts::AWS::EC2 do
@@ -55,6 +54,15 @@ describe VScripts::AWS::EC2 do
     end
   end
 
+  describe '#all_tags_hash' do
+    it 'returns a Hash' do
+      allow(subject).to receive('all_tags')
+        .and_return(tags)
+      expect(subject.all_tags_hash).to be_an_instance_of Hash
+      expect(subject.all_tags_hash).to eq({"Name"=>"test"})
+    end
+  end
+
   describe '#tags_without' do
     it 'returns a filtered Hash' do
       allow(subject).to receive('all_tags')

data/spec/unit/vscripts/aws_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'aws_spec_helper'
 require 'vscripts/aws'
 
 describe VScripts::AWS do

data/spec/unit/vscripts/command_line_spec.rb

@@ -2,9 +2,10 @@ require 'spec_helper'
 require 'vscripts/command_line'
 
 describe VScripts::CommandLine do
-  subject { VScripts::CommandLine.new([cmd, 'extra_args']) }
   let(:cmd) { VScripts::Commands.list.first.to_s }
 
+  subject { VScripts::CommandLine.new([cmd, 'extra_args']) }
+
   describe '#new' do
     it 'returns the command line arguments' do
       expect(subject).to be_an_instance_of VScripts::CommandLine
@@ -13,7 +14,7 @@ describe VScripts::CommandLine do
 
   describe '#global' do
     it 'returns the global options as a Hash' do
-      expect(subject.global).to be_an_instance_of Hash
+      expect(subject.global).to be_a Hash
     end
   end
 
@@ -26,8 +27,8 @@ describe VScripts::CommandLine do
 
   describe '#extra' do
     it 'returns the rest of the arguments as an Array' do
-      expect(subject.arguments).to be_an_instance_of Array
-      expect(subject.arguments).to eql ['extra_args']
+      expect(subject.command_options).to be_an_instance_of Array
+      expect(subject.command_options).to eql ['extra_args']
     end
   end
 

data/spec/unit/vscripts/commands/identify_spec.rb

@@ -15,6 +15,10 @@ describe VScripts::Commands::Identify do
   end
 
   describe '#new' do
+    it 'returns extra arguments' do
+      expect(subject.arguments).to be_an Array
+    end
+
     context 'when theme is not passed' do
       it 'returns the default theme' do
         expect(subject.theme).to eq('Group-Role-#')
@@ -23,8 +27,8 @@ describe VScripts::Commands::Identify do
 
     context 'when theme is passed' do
       it 'returns the theme' do
-        subject1 = VScripts::Commands::Identify.new(['--ec2-tag-theme=test'])
-        expect(subject1.theme).to eq('test')
+        subject = VScripts::Commands::Identify.new(['--ec2-tag-theme=test'])
+        expect(subject.theme).to eq('test')
       end
     end
 
@@ -36,8 +40,8 @@ describe VScripts::Commands::Identify do
 
     context 'when host is passed' do
       it 'returns the host' do
-        subject2 = VScripts::Commands::Identify.new(['--host=test'])
-        expect(subject2.host).to eq('test')
+        subject = VScripts::Commands::Identify.new(['--host=test'])
+        expect(subject.host).to eq('test')
       end
     end
 
@@ -49,8 +53,8 @@ describe VScripts::Commands::Identify do
 
     context 'when domain is passed' do
       it 'returns the domain' do
-        subject3 = VScripts::Commands::Identify.new(['--domain=test'])
-        expect(subject3.domain).to eq('test')
+        subject = VScripts::Commands::Identify.new(['--domain=test'])
+        expect(subject.domain).to eq('test')
       end
     end
   end
@@ -100,8 +104,8 @@ describe VScripts::Commands::Identify do
 
     context 'when host is passed' do
       it 'returns a string' do
-        subject4 = VScripts::Commands::Identify.new(['--host=test'])
-        expect(subject4.new_hostname).to eq('test')
+        subject = VScripts::Commands::Identify.new(['--host=test'])
+        expect(subject.new_hostname).to eq('test')
       end
     end
   end
@@ -127,8 +131,8 @@ describe VScripts::Commands::Identify do
 
     context 'when domain is passed' do
       it 'returns a string' do
-        subject5 = VScripts::Commands::Identify.new(['--domain=test'])
-        expect(subject5.new_domain).to eq('test')
+        subject = VScripts::Commands::Identify.new(['--domain=test'])
+        expect(subject.new_domain).to eq('test')
       end
     end
   end
@@ -171,8 +175,8 @@ describe VScripts::Commands::Identify do
       allow(subject).to receive(:set_name_tag)
       allow(subject).to receive(:set_hostname)
       allow(subject).to receive(:update_hosts)
-      expect(STDOUT).to receive(:puts).with('Done.')
-      subject.execute
+      allow(STDOUT).to receive(:puts)
+      expect(subject.execute).to be_nil
     end
   end
 end

data/spec/unit/vscripts/commands/tags2facts_spec.rb

@@ -11,6 +11,10 @@ describe VScripts::Commands::Tags2facts do
   end
 
   describe '#new' do
+    it 'returns extra arguments' do
+      expect(subject.arguments).to be_an Array
+    end
+
     it 'returns cli arguments' do
       expect(subject.cli).to be_a Hash
     end

data/spec/unit/vscripts/commands_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'vscripts/commands'
 
 describe VScripts::Commands do
-  describe '#list' do
+  describe '.list' do
     it 'returns a list of available commands' do
       expect(VScripts::Commands.list).to be_an_instance_of Array
     end

data/spec/unit/vscripts/config_spec.rb

@@ -0,0 +1,53 @@
+require 'spec_helper'
+require 'vscripts/config'
+
+describe VScripts::Config do
+  include_context 'Temporary'
+  subject { VScripts::Config.new }
+
+  describe '#new' do
+    context 'when config file not passed' do
+      it 'returns nil' do
+        expect(subject.instance_variable_get(:@file)).to be_nil
+      end
+    end
+    context 'when config file passed' do
+      it 'returns the path' do
+        subject = VScripts::Config.new('/path/to/file')
+        expect(subject.instance_variable_get(:@file)).to eq('/path/to/file')
+      end
+    end
+  end
+
+  describe '#get' do
+    it 'returns a Hash' do
+      expect(subject.get).to be_a Hash
+    end
+  end
+
+  describe '#options' do
+    it 'returns a Hash' do
+      expect(subject.options).to be_a Hash
+    end
+  end
+
+  describe '#parse' do
+    it 'returns a Hash' do
+      allow(File).to receive(:exist?).and_return(true)
+      allow(File).to receive(:read).and_return('testkey: testvalue')
+      expect(subject.parse('test')).to be_a Hash
+    end
+  end
+
+  describe '#read' do
+    it 'returns a String' do
+      expect(subject.read(test_file)).to be_a String
+    end
+  end
+
+  describe '#check_config' do
+    it 'returns Boolean' do
+      expect(subject.check_config(test_file))
+    end
+  end
+end

data/spec/unit/vscripts/util/local_system_spec.rb

@@ -1,13 +1,10 @@
 require 'spec_helper'
-require 'tempfile'
 require 'vscripts/util'
 
 describe VScripts::Util::LocalSystem do
   subject { Object.new.extend VScripts::Util }
 
-  let(:test_dir) { Dir::Tmpname.make_tmpname('/tmp/vscripts-test-', nil) }
-  let(:test_file) { "#{test_dir}/test_file" }
-  let(:test_cont) { 'testing content' }
+  include_context 'Temporary'
 
   describe '#hosts_path' do
     it 'returns the path to hosts file' do
@@ -21,13 +18,6 @@ describe VScripts::Util::LocalSystem do
     end
   end
 
-  describe '#hosts_file' do
-    it 'returns the an array' do
-      allow(File).to receive(:read).and_return(test_cont)
-      expect(subject.hosts_file).to be_a String
-    end
-  end
-
   describe '#local_fqdn' do
     it 'returns the local FQDN' do
       expect(subject.local_fqdn).to be_a String
@@ -43,6 +33,8 @@ describe VScripts::Util::LocalSystem do
   describe '#local_domain_name' do
     it 'returns the local domain name' do
       expect(subject.local_domain_name).to be_a String
+      allow(subject).to receive('`').and_raise(StandardError)
+      expect(subject.local_domain_name).to eq('local')
     end
   end
 
@@ -57,7 +49,7 @@ describe VScripts::Util::LocalSystem do
 
   describe '#ensure_file_dir' do
     it 'create a directory for the specified files' do
-      subject.ensure_file_dir(test_file)
+      subject.ensure_file_dir(test_missing_file)
       expect(Dir.exists?(test_dir)).to be true
     end
   end

data/spec/unit/vscripts/version_spec.rb

@@ -3,6 +3,18 @@ require 'vscripts/version'
 
 describe 'VScripts::VERSION' do
   it 'Should be a string' do
-    expect(VScripts::VERSION).to be_an_instance_of String
+    expect(VScripts::VERSION::STRING).to be_a String
+  end
+  it 'Should have a major version' do
+    expect(VScripts::VERSION::MAJOR).to be_an Integer
+  end
+  it 'Should have a minor version' do
+    expect(VScripts::VERSION::MINOR).to be_an Integer
+  end
+  it 'Should have a patch version' do
+    expect(VScripts::VERSION::PATCH).to be_an Integer
+  end
+  it 'Should have a copyright version' do
+    expect(VScripts::VERSION::COPYRIGHT).to be_a String
   end
 end

data/spec/unit/vscripts_spec.rb

@@ -2,26 +2,45 @@ require 'spec_helper'
 require 'vscripts'
 
 describe VScripts do
-  before(:all) do
-    $stdout = StringIO.new
-    @cmd = VScripts::Commands.list.first.to_s.downcase
-  end
+  include_context 'Suppressed output'
+  include_context 'VScripts'
 
-  after(:all) do
-    $stdout = STDOUT
-  end
+  describe '.run' do
+    context 'when no command line arguments' do
+      it 'returns help' do
+        expect{stub_cli_with('')}.to raise_error(SystemExit)
+        expect($stdout.string).to match(/Available commands/)
+      end
+    end
 
-  describe '#run' do
-    it 'returns help' do
-      expect{subject.run(['-h'])}.to raise_error(SystemExit)
+    context 'when \'-h\'' do
+      it 'returns help' do
+        expect{stub_cli_with('-h')}.to raise_error(SystemExit)
+        expect($stdout.string).to match(/Available commands/)
+      end
     end
 
-    it 'returns version' do
-      expect{subject.run(['-v'])}.to raise_error(SystemExit)
+    context 'when \'-v\'' do
+      it 'returns version' do
+        expect{stub_cli_with('-v')}.to raise_error(SystemExit)
+        expect($stdout.string).to match(/VScripts.*(c)/)
+      end
     end
+  end
+
+  describe '.cli' do
+    it 'returns subcommand and arguments' do
+      allow(VScripts::CommandLine).to receive(:new)
+        .and_return(VScripts::CommandLine.new("#{cmd} -h".split))
+      expect{subject.run}.to raise_error(SystemExit)
+      expect($stdout.string).to match(/USAGE:/)
+      expect($stdout.string).to match(/OPTIONS:/)
+    end
+  end
 
-    it 'returns command help' do
-      expect{subject.run([@cmd, '-h'])}.to raise_error(SystemExit)
+  describe '.config' do
+    it 'returns a hash' do
+      expect(subject.config.get).to be_a Hash
     end
   end
 end

data/tasks/deploy.rake

@@ -1,27 +1,32 @@
+require 'vscripts/version'
+
 DEV_BRANCH     = 'development'
 LOG_RANGE      = "master...#{DEV_BRANCH}"
-VERSION_FILE   = 'VERSION'
 CHANGELOG_FILE = 'CHANGELOG.md'
 
 desc 'Automated deployment (increment patch)'
 task :deploy do
-  bump_version('patch')
+  check_branch
+  bump_version
   deploy
 end
 
 namespace 'deploy' do
   desc 'Automated deployment (increment patch)'
   task :patch do
+    check_branch
     bump_version('patch')
     deploy
   end
   desc 'Automated deployment (increment minor)'
   task :minor do
+    check_branch
     bump_version('minor')
     deploy
   end
   desc 'Automated deployment (increment major)'
   task :major do
+    check_branch
     bump_version('major')
     deploy
   end
@@ -30,7 +35,6 @@ end
 def deploy
   commit_changelog
   merge_changes
-  push_release
 end
 
 def check_branch
@@ -43,20 +47,23 @@ def check_branch
 end
 
 def bump_version(type = 'patch')
-  check_branch
-  @version = File.read(VERSION_FILE).strip
-  @version.gsub(/(\d+)\.(\d+)\.(\d+)/) {
-    @major, @minor, @patch = $1.to_i, $2.to_i, $3.to_i
-  }
+  include VScripts::VERSION
   case type
   when 'patch'
-    @new_version = "#{@major}.#{@minor}.#{@patch + 1}"
+    @new_version = "#{MAJOR}.#{MINOR}.#{PATCH + 1}"
   when 'minor'
-    @new_version = "#{@major}.#{@minor + 1}.0"
+    @new_version = "#{MAJOR}.#{MINOR + 1}.0"
   when 'major'
-    @new_version = "#{@major + 1}.0.0"
+    @new_version = "#{MAJOR + 1}.0.0"
   end
-  File.write('VERSION', @new_version)
+  write_bumped_version
+end
+
+def write_bumped_version
+  version_file = 'lib/vscripts/version.rb'
+  version_content = File.read(version_file)
+  modified = version_content.gsub(/#{VScripts::VERSION::STRING}/, @new_version)
+  File.write(version_file, modified)
 end
 
 def changelog
@@ -91,7 +98,7 @@ def commit_changelog
 end
 
 def branch
-  @branch ||= `git branch`.match(/^\* (\S+)/)[1]
+  `git branch`.match(/^\* (\S+)/)[1]
 end
 
 def switch_to_branch(name)
@@ -103,10 +110,12 @@ def merge
 end
 
 def merge_changes
+  previous = branch
   switch_to_branch('master')
   puts "Merging \"#{DEV_BRANCH}\" branch"
   abort 'ERROR: Conflicts found; Stopping!' if merge =~ /conflict/i
-  switch_to_branch(branch) # Switch back to whatever branch was before
+  push_release
+  switch_to_branch(previous)
 end
 
 def push_release

data/vscripts.gemspec

@@ -5,20 +5,22 @@ require 'vscripts/version'
 
 Gem::Specification.new do |spec|
   spec.name        = 'vscripts'
-  spec.version     = VScripts::VERSION
+  spec.version     = VScripts::VERSION::STRING
   spec.authors     = ['Vlad Ghinea']
   spec.email       = ['vlad@ghn.me']
   spec.summary     = %q{VladGh.com's automation scripts}
+  spec.homepage    = 'https://github.com/vghn/vscripts'
+  spec.license     = 'Apache 2.0'
   spec.description = <<-EOF
 VScripts is a command line utility that performs a series of tasks used on
 VladGh.com's deployment.
 EOF
-  spec.homepage    = 'https://github.com/vghn/vscripts'
-  spec.license     = 'Apache 2.0'
 
-  spec.metadata = {
-    'issue_tracker' => 'https://github.com/vghn/vscripts/issues'
-  }
+  if spec.respond_to?(:metadata=)
+    spec.metadata = {
+      'issue_tracker' => 'https://github.com/vghn/vscripts/issues'
+    }
+  end
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }