ronin 1.5.0 → 1.5.1

data/spec/service_spec.rb

@@ -1,18 +1,24 @@
 require 'spec_helper'
+
 require 'ronin/service'
 
 describe Service do
-  before(:all) { @service = Service.create(:name => 'Apache') }
+  let(:name) { 'Apache' }
 
-  it "should require a name" do
-    service = Service.new
+  subject { described_class.new(:name => name) }
+  before  { subject.save }
 
-    service.should_not be_valid
-  end
+  describe "validations" do
+    it "should require a name" do
+      service = described_class.new
+
+      expect(service).not_to be_valid
+    end
 
-  it "should require a unique name" do
-    service = Service.new(:name => 'Apache')
+    it "should require a unique name" do
+      service = described_class.new(:name => name)
 
-    service.should_not be_valid
+      expect(service).not_to be_valid
+    end
   end
 end

data/spec/software_spec.rb

@@ -1,33 +1,46 @@
 require 'spec_helper'
+
 require 'ronin/software'
 
 describe Software do
-  it "should require name and version attributes" do
-    software = Software.new
-    software.should_not be_valid
+  let(:name)    { 'Test'  }
+  let(:version) { '0.1.0' }
+  let(:vendor)  { 'TestCo' }
+
+  subject do
+    described_class.new(
+      :name    => name,
+      :version => version,
+      :vendor  => {:name => vendor}
+    )
+  end
 
-    software.name = 'Test'
-    software.should_not be_valid
+  describe "validations" do
+    it "should require name and version attributes" do
+      software = described_class.new
+      expect(software).not_to be_valid
 
-    software.version = '0.1.0'
-    software.should be_valid
+      software.name = name
+      expect(software).not_to be_valid
+
+      software.version = version
+      expect(software).to be_valid
+    end
   end
 
   describe "#to_s" do
     it "should be convertable to a String" do
-      software = Software.new(
-        :name => 'Test', 
-        :version => '0.1.0',
-        :vendor => {:name => 'TestCo'}
-      )
-
-      software.to_s.should == 'TestCo Test 0.1.0'
+      expect(subject.to_s).to eq("#{vendor} #{name} #{version}")
     end
 
-    it "should ignore the missing vendor information" do
-      software = Software.new(:name => 'Test', :version => '0.1.0')
+    context "without a vendor" do
+      subject do
+        described_class.new(:name => name, :version => version)
+      end
 
-      software.to_s.should == 'Test 0.1.0'
+      it "should ignore the missing vendor information" do
+        expect(subject.to_s).to eq("#{name} #{version}")
+      end
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
 require 'rspec'
-require 'model/models/basic_model'
-require 'model/models/custom_model'
+require 'model/models/base_model'
+require 'model/models/inherited_model'
 require 'model/models/authored_model'
 require 'model/models/described_model'
 require 'model/models/licensed_model'
@@ -17,8 +17,8 @@ include Ronin
 RSpec.configure do |spec|
   spec.before(:suite) do
     [
-      BasicModel,
-      CustomModel,
+      BaseModel,
+      InheritedModel,
       AuthoredModel,
       DescribedModel,
       LicensedModel,

data/spec/ui/cli/classes/test_command.rb

@@ -18,10 +18,8 @@ class TestCommand < Ronin::UI::CLI::Command
   argument :files, :type => Array
 
   def execute
-    if @foo
-      'foo task'
-    else
-      'default task'
+    if @foo then 'foo task'
+    else         'default task'
     end
   end
 

data/spec/ui/cli/cli_spec.rb

@@ -8,7 +8,7 @@ describe UI::CLI do
     it { should_not be_empty }
 
     it "should replace '/' characters with a ':'" do
-      subject.all? { |command| command.include?('/') }.should be_false
+      expect(subject.all? { |command| command.include?('/') }).to be(false)
     end
   end
 
@@ -16,19 +16,19 @@ describe UI::CLI do
     it "should load classes from 'ronin/ui/cli/commands/'" do
       command = subject.command('help')
       
-      command.name.should == 'Ronin::UI::CLI::Commands::Help'
+      expect(command.name).to eq('Ronin::UI::CLI::Commands::Help')
     end
 
     it "should load classes from namespaces within 'ronin/ui/cli/commands/'" do
       command = subject.command('net:proxy')
       
-      command.name.should == 'Ronin::UI::CLI::Commands::Net::Proxy'
+      expect(command.name).to eq('Ronin::UI::CLI::Commands::Net::Proxy')
     end
 
     it "should raise UnknownCommand for unknown commands" do
-      lambda {
+      expect {
         subject.command('foo')
-      }.should raise_error(described_class::UnknownCommand)
+      }.to raise_error(described_class::UnknownCommand)
     end
   end
 end

data/spec/ui/cli/command_spec.rb

@@ -8,14 +8,14 @@ describe UI::CLI::Command do
 
   describe "command_name" do
     it "should be derived from the Class name" do
-      subject.command_name.should == 'test_command'
+      expect(subject.command_name).to eq('test_command')
     end
   end
 
   describe "usage" do
     context "without an argument" do
       it "should return the set usage" do
-        subject.usage.should == '[options] PATH FILE [..]'
+        expect(subject.usage).to eq('[options] PATH FILE [..]')
       end
     end
 
@@ -26,7 +26,7 @@ describe UI::CLI::Command do
       before  { subject.usage expected }
 
       it "should set the usage" do
-        subject.usage.should == expected
+        expect(subject.usage).to eq(expected)
       end
     end
 
@@ -42,7 +42,7 @@ describe UI::CLI::Command do
       subject { Class.new(superclass).usage }
 
       it "should default to the usage of the superclass" do
-        subject.should == superclass.usage
+        expect(subject).to eq(superclass.usage)
       end
     end
   end
@@ -50,7 +50,7 @@ describe UI::CLI::Command do
   describe "summary" do
     context "without an argument" do
       it "should return the set summary" do
-        subject.summary.should == 'Tests the default task'
+        expect(subject.summary).to eq('Tests the default task')
       end
     end
 
@@ -61,7 +61,7 @@ describe UI::CLI::Command do
       before  { subject.summary expected }
 
       it "should set the usage" do
-        subject.summary.should == expected
+        expect(subject.summary).to eq(expected)
       end
     end
 
@@ -77,7 +77,7 @@ describe UI::CLI::Command do
       subject { Class.new(superclass).summary }
 
       it "should default to the summary of the superclass" do
-        subject.should == superclass.summary
+        expect(subject).to eq(superclass.summary)
       end
     end
   end
@@ -98,7 +98,7 @@ describe UI::CLI::Command do
       before  { subject.examples expected }
 
       it "should set the usage" do
-        subject.examples.should == expected
+        expect(subject.examples).to eq(expected)
       end
     end
 
@@ -114,7 +114,7 @@ describe UI::CLI::Command do
       subject { Class.new(superclass).examples }
 
       it "should default to the examples of the superclass" do
-        subject.should == superclass.examples
+        expect(subject).to eq(superclass.examples)
       end
     end
   end
@@ -124,7 +124,7 @@ describe UI::CLI::Command do
 
     context "inherited" do
       it "should be {} by default" do
-        subject.should == {}
+        expect(subject).to eq({})
       end
     end
 
@@ -132,26 +132,30 @@ describe UI::CLI::Command do
       subject { described_class.options }
 
       it "should have a :verbose option" do
-        subject.should have_key(:verbose)
+        expect(subject).to have_key(:verbose)
       end
 
       it "should have a :quiet option" do
-        subject.should have_key(:quiet)
+        expect(subject).to have_key(:quiet)
       end
 
       it "should have a :silent option" do
-        subject.should have_key(:silent)
+        expect(subject).to have_key(:silent)
       end
 
       it "should have a :color option" do
-        subject.should have_key(:color)
+        expect(subject).to have_key(:color)
       end
 
       describe "color option" do
         subject { described_class.new.color }
 
         context "when $stdout is a TTY" do
-          it { should be_true }
+          it do
+            skip "$stdout is not a TTY" unless $stdout.tty?
+
+            expect(subject).to be(true)
+          end
         end
 
         context "when $stdout is not a TTY" do
@@ -160,7 +164,7 @@ describe UI::CLI::Command do
             $stdout     = StringIO.new
           end
 
-          it { should be_false }
+          it { expect(subject).to be(false) }
 
           after do
             $stdout = @old_stdout
@@ -174,11 +178,11 @@ describe UI::CLI::Command do
     let(:name) { :foo }
 
     it "should define an option" do
-      subject.options[name].should be_kind_of(Hash)
+      expect(subject.options[name]).to be_kind_of(Hash)
     end
 
     it "should define a parameter" do
-      subject.should have_param(name)
+      expect(subject).to have_param(name)
     end
   end
 
@@ -192,13 +196,13 @@ describe UI::CLI::Command do
         names << name
       end
 
-      names.should =~ expected
+      expect(names).to match_array(expected)
     end
   end
 
   describe "options?" do
     it "should test if there are any defined options" do
-      subject.options?.should be_true
+      expect(subject.options?).to be(true)
     end
   end
 
@@ -217,11 +221,11 @@ describe UI::CLI::Command do
     before  { subject.argument name      }
 
     it "should add to arguments" do
-      subject.arguments.should include(name)
+      expect(subject.arguments).to include(name)
     end
 
     it "should define a parameter" do
-      subject.should have_param(name)
+      expect(subject).to have_param(name)
     end
   end
 
@@ -233,13 +237,13 @@ describe UI::CLI::Command do
 
       subject.each_argument { |name| names << name }
 
-      names.should =~ expected
+      expect(names).to match_array(expected)
     end
   end
 
   describe "arguments?" do
     it "should test if there are any defined arguments" do
-      subject.arguments?.should be_true
+      expect(subject.arguments?).to be(true)
     end
   end
 
@@ -250,7 +254,7 @@ describe UI::CLI::Command do
 
       command.run(:foo => value)
 
-      command.foo.should == value
+      expect(command.foo).to eq(value)
     end
   end
 
@@ -261,7 +265,7 @@ describe UI::CLI::Command do
       value = 'baz'
       subject.start(['--foo', value])
 
-      subject.foo.should == value
+      expect(subject.foo).to eq(value)
     end
 
     it "should parse additional arguments" do
@@ -269,7 +273,7 @@ describe UI::CLI::Command do
 
       subject.start([path])
 
-      subject.path.should == path
+      expect(subject.path).to eq(path)
     end
 
     it "should parse additional arguments into an Array/Set argument" do
@@ -279,9 +283,9 @@ describe UI::CLI::Command do
 
       subject.start(['--foo', value, path, *files])
 
-      subject.foo.should == value
-      subject.path.should == path
-      subject.files.should == files
+      expect(subject.foo).to eq(value)
+      expect(subject.path).to eq(path)
+      expect(subject.files).to eq(files)
     end
   end
 end

data/spec/url_query_param_spec.rb

@@ -1,32 +1,41 @@
 require 'spec_helper'
+
 require 'ronin/url_query_param'
 
 describe URLQueryParam do
-  it "should require a name" do
-    param = URLQueryParam.new
+  let(:name)  { 'foo' }
+  let(:value) { 'bar' }
 
-    param.should_not be_valid
+  subject do
+    described_class.new(:name => {:name => name}, :value => value)
   end
 
   describe "#to_s" do
-    let(:name) { URLQueryParamName.new(:name => 'foo') }
-
     it "should dump a name and a value into a String" do
-      param = URLQueryParam.new(:name => name, :value => 'bar')
-
-      param.to_s.should == "foo=bar"
+      expect(subject.to_s).to eq("#{name}=#{value}")
     end
 
-    it "should ignore empty or nil values" do
-      param = URLQueryParam.new(:name => name)
+    context "with empty or nil values" do
+      subject do
+        described_class.new(:name => {:name => name})
+      end
 
-      param.to_s.should == "foo="
+      it "should ignore empty or nil values" do
+        expect(subject.to_s).to eq("#{name}=")
+      end
     end
 
-    it "should escape special characters" do
-      param = URLQueryParam.new(:name => name, :value => 'bar baz')
+    context "with special characters" do
+      let(:value)         { 'bar baz'         }
+      let(:encoded_value) { URI::DEFAULT_PARSER.escape(value) }
+
+      subject do
+        described_class.new(:name => {:name => name}, :value => value)
+      end
 
-      param.to_s.should == "foo=bar%20baz"
+      it "should escape special characters" do
+        expect(subject.to_s).to eq("#{name}=#{encoded_value}")
+      end
     end
   end
 end

data/spec/url_scheme_spec.rb

@@ -1,18 +1,21 @@
 require 'spec_helper'
+
 require 'ronin/url_scheme'
 
 describe URLScheme do
-  before(:all) { @scheme = URLScheme.create(:name => 'http') }
-
-  it "should require a name" do
-    scheme = URLScheme.new
+  before(:all) { described_class.create(:name => 'http') }
 
-    scheme.should_not be_valid
-  end
+  describe "validations" do
+    it "should require a name" do
+      expect(subject).not_to be_valid
+    end
 
-  it "should require a unique name" do
-    scheme = URLScheme.new(:name => 'http')
+    describe "name" do
+      subject { described_class.new(:name => 'http') }
 
-    scheme.should_not be_valid
+      it "should require a unique name" do
+        expect(subject).not_to be_valid
+      end
+    end
   end
 end