linux_admin 0.1.3 → 0.2.0

data/spec/registration_system_spec.rb

@@ -18,13 +18,13 @@ describe LinuxAdmin::RegistrationSystem do
     end
 
     it "should memoize results" do
-      described_class.should_receive(:registration_type_uncached).once.and_call_original
+      described_class.should_receive(:registration_type_uncached).once.and_return("anything_non_nil")
       described_class.registration_type
       described_class.registration_type
     end
 
     it "with reload should refresh results" do
-      described_class.should_receive(:registration_type_uncached).twice.and_call_original
+      described_class.should_receive(:registration_type_uncached).twice.and_return("anything_non_nil")
       described_class.registration_type
       described_class.registration_type(true)
     end

data/spec/rhn_spec.rb

@@ -24,7 +24,7 @@ describe LinuxAdmin::Rhn do
     end
 
     it "with username and password" do
-      described_class.any_instance.should_receive(:run).once.with("rhnreg_ks", {:params=>{"--username="=>"SomeUser", "--password="=>"SomePass", "--proxy="=>"1.2.3.4", "--proxyUser="=>"ProxyUser", "--proxyPassword="=>"ProxyPass", "--serverUrl="=>"192.168.1.1"}}).and_return(0)
+      described_class.any_instance.should_receive(:run!).once.with("rhnreg_ks", {:params=>{"--username="=>"SomeUser", "--password="=>"SomePass", "--proxy="=>"1.2.3.4", "--proxyUser="=>"ProxyUser", "--proxyPassword="=>"ProxyPass", "--serverUrl="=>"192.168.1.1"}})
       described_class.new.register(
         :username       => "SomeUser",
         :password       => "SomePass",
@@ -36,7 +36,7 @@ describe LinuxAdmin::Rhn do
     end
 
     it "with activation key" do
-      described_class.any_instance.should_receive(:run).once.with("rhnreg_ks", {:params=>{"--activationkey="=>"123abc", "--proxy="=>"1.2.3.4", "--proxyUser="=>"ProxyUser", "--proxyPassword="=>"ProxyPass", "--serverUrl="=>"192.168.1.1"}}).and_return(0)
+      described_class.any_instance.should_receive(:run!).once.with("rhnreg_ks", {:params=>{"--activationkey="=>"123abc", "--proxy="=>"1.2.3.4", "--proxyUser="=>"ProxyUser", "--proxyPassword="=>"ProxyPass", "--serverUrl="=>"192.168.1.1"}})
       described_class.new.register(
         :activationkey  => "123abc",
         :proxy_address  => "1.2.3.4",
@@ -53,7 +53,7 @@ describe LinuxAdmin::Rhn do
     end
 
     it "with pools" do
-      described_class.any_instance.should_receive(:run).once.with("rhn-channel -a", {:params=>[["--user=", "SomeUser"], ["--password=", "SomePass"], ["--channel=", 123], ["--channel=", 456]]})
+      described_class.any_instance.should_receive(:run!).once.with("rhn-channel -a", {:params=>[["--user=", "SomeUser"], ["--password=", "SomePass"], ["--channel=", 123], ["--channel=", 456]]})
       described_class.new.subscribe({
         :username => "SomeUser",
         :password => "SomePass",

data/spec/rpm_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe LinuxAdmin::Rpm do
   it ".list_installed" do
-    described_class.stub(:run => sample_output("rpm/cmd_output_for_list_installed"))
+    described_class.stub(:run! => double(:output => sample_output("rpm/cmd_output_for_list_installed")))
     expect(described_class.list_installed).to eq({
       "ruby193-rubygem-some_really_long_name" =>"1.0.7-1.el6",
       "fipscheck-lib"                         =>"1.2.0-7.el6",

data/spec/service_spec.rb

@@ -13,15 +13,14 @@ describe LinuxAdmin::Service do
     it "checks service" do
       @service.should_receive(:run).
          with(@service.cmd(:service),
-              :params => { nil => ['foo', 'status']},
-              :return_exitstatus => true)
+              :params => { nil => ['foo', 'status']}).and_return(double(:exit_status => 0))
       @service.running?
     end
 
     context "service is running" do
       it "returns true" do
         @service = LinuxAdmin::Service.new :id => :foo
-        @service.should_receive(:run).and_return(0)
+        @service.should_receive(:run).and_return(double(:exit_status => 0))
         @service.should be_running
      end
     end
@@ -29,7 +28,7 @@ describe LinuxAdmin::Service do
     context "service is not running" do
       it "returns false" do
         @service = LinuxAdmin::Service.new :id => :foo
-        @service.should_receive(:run).and_return(1)
+        @service.should_receive(:run).and_return(double(:exit_status => 1))
         @service.should_not be_running
       end
     end
@@ -37,56 +36,56 @@ describe LinuxAdmin::Service do
 
   describe "#enable" do
     it "enables service" do
-      @service.should_receive(:run).
+      @service.should_receive(:run!).
          with(@service.cmd(:systemctl),
               :params => { nil => [ 'enable', 'foo.service']})
       @service.enable
     end
 
     it "returns self" do
-      @service.should_receive(:run) # stub out cmd invocation
+      @service.should_receive(:run!) # stub out cmd invocation
       @service.enable.should == @service
     end
   end
 
   describe "#disable" do
     it "disable service" do
-      @service.should_receive(:run).
+      @service.should_receive(:run!).
          with(@service.cmd(:systemctl),
               :params => { nil => [ 'disable', 'foo.service']})
       @service.disable
     end
 
     it "returns self" do
-      @service.should_receive(:run)
+      @service.should_receive(:run!)
       @service.disable.should == @service
     end
   end
 
   describe "#start" do
     it "starts service" do
-      @service.should_receive(:run).
+      @service.should_receive(:run!).
          with(@service.cmd(:service),
               :params => { nil => [ 'foo', 'start']})
       @service.start
     end
 
     it "returns self" do
-      @service.should_receive(:run)
+      @service.should_receive(:run!)
       @service.start.should == @service
     end
   end
 
   describe "#stop" do
     it "stops service" do
-      @service.should_receive(:run).
+      @service.should_receive(:run!).
          with(@service.cmd(:service),
               :params => { nil => [ 'foo', 'stop']})
       @service.stop
     end
 
     it "returns self" do
-      @service.should_receive(:run)
+      @service.should_receive(:run!)
       @service.stop.should == @service
     end
   end
@@ -95,14 +94,13 @@ describe LinuxAdmin::Service do
     it "stops service" do
       @service.should_receive(:run).
          with(@service.cmd(:service),
-              :params => { nil => [ 'foo', 'restart']},
-              :return_exitstatus => true).and_return(0)
+              :params => { nil => [ 'foo', 'restart']}).and_return(double(:exit_status => 0))
       @service.restart
     end
 
     context "service restart fails" do
       it "manually stops/starts service" do
-        @service.should_receive(:run).and_return(1)
+        @service.should_receive(:run).and_return(double(:exit_status => 1))
         @service.should_receive(:stop)
         @service.should_receive(:start)
         @service.restart
@@ -110,7 +108,7 @@ describe LinuxAdmin::Service do
     end
 
     it "returns self" do
-      @service.should_receive(:run).and_return(0)
+      @service.should_receive(:run).and_return(double(:exit_status => 0))
       @service.restart.should == @service
     end
   end

data/spec/subscription_manager_spec.rb

@@ -3,18 +3,18 @@ require 'spec_helper'
 describe LinuxAdmin::SubscriptionManager do
   context "#registered?" do
     it "system with subscription-manager commands" do
-      described_class.any_instance.should_receive(:run).once.with("subscription-manager identity", {:return_exitstatus=>true}).and_return(0)
+      described_class.any_instance.should_receive(:run).once.with("subscription-manager identity").and_return(double(:exit_status => 0))
       expect(described_class.new.registered?).to be_true
     end
 
     it "system without subscription-manager commands" do
-      described_class.any_instance.should_receive(:run).once.with("subscription-manager identity", {:return_exitstatus=>true}).and_return(255)
+      described_class.any_instance.should_receive(:run).once.with("subscription-manager identity").and_return(double(:exit_status => 255))
       expect(described_class.new.registered?).to be_false
     end
   end
 
   it "#refresh" do
-    described_class.any_instance.should_receive(:run).once.with("subscription-manager refresh").and_return(0)
+    described_class.any_instance.should_receive(:run!).once.with("subscription-manager refresh")
     described_class.new.refresh
   end
 
@@ -24,7 +24,8 @@ describe LinuxAdmin::SubscriptionManager do
     end
 
     it "with username and password" do
-      described_class.any_instance.should_receive(:run).once.with("subscription-manager register", {:params=>{"--username="=>"SomeUser", "--password="=>"SomePass", "--org="=>"IT", "--proxy="=>"1.2.3.4", "--proxyuser="=>"ProxyUser", "--proxypassword="=>"ProxyPass", "--serverurl="=>"192.168.1.1"}}).and_return(0)
+      run_options = ["subscription-manager register", {:params=>{"--username="=>"SomeUser", "--password="=>"SomePass", "--org="=>"IT", "--proxy="=>"1.2.3.4", "--proxyuser="=>"ProxyUser", "--proxypassword="=>"ProxyPass", "--serverurl="=>"192.168.1.1"}}]
+      described_class.any_instance.should_receive(:run!).once.with(*run_options)
       described_class.new.register(
         :username       => "SomeUser",
         :password       => "SomePass",
@@ -38,12 +39,12 @@ describe LinuxAdmin::SubscriptionManager do
   end
 
   it "#subscribe" do
-    described_class.any_instance.should_receive(:run).once.with("subscription-manager attach", {:params=>[["--pool", 123], ["--pool", 456]]})
+    described_class.any_instance.should_receive(:run!).once.with("subscription-manager attach", {:params=>[["--pool", 123], ["--pool", 456]]})
     described_class.new.subscribe({:pools => [123, 456]})
   end
 
   it "#available_subscriptions" do
-    described_class.any_instance.should_receive(:run).once.with("subscription-manager list --all --available", :return_output => true).and_return(sample_output("subscription_manager/output_list_all_available"))
+    described_class.any_instance.should_receive(:run!).once.with("subscription-manager list --all --available").and_return(double(:output => sample_output("subscription_manager/output_list_all_available")))
     expect(described_class.new.available_subscriptions).to eq({
       "82c042fca983889b10178893f29b06e3" => {
         :subscription_name => "Example Subscription",
@@ -92,8 +93,17 @@ describe LinuxAdmin::SubscriptionManager do
     })
   end
 
-  it "#organizations" do
-    described_class.any_instance.should_receive(:run).once.with("subscription-manager orgs", {:params=>{"--username="=>"SomeUser", "--password="=>"SomePass", "--proxy="=>"1.2.3.4", "--proxyuser="=>"ProxyUser", "--proxypassword="=>"ProxyPass", "--serverurl="=>"192.168.1.1"}, :return_output => true}).and_return(sample_output("subscription_manager/output_orgs"))
-    expect(described_class.new.organizations({:username=>"SomeUser", :password=>"SomePass", :proxy_address=>"1.2.3.4", :proxy_username=>"ProxyUser", :proxy_password=>"ProxyPass", :server_url=>"192.168.1.1"})).to eq({"SomeOrg"=>{:name=>"SomeOrg", :key=>"1234567"}})
+  context "#organizations" do
+    it "with valid credentials" do
+      run_options = ["subscription-manager orgs", {:params=>{"--username="=>"SomeUser", "--password="=>"SomePass", "--proxy="=>"1.2.3.4", "--proxyuser="=>"ProxyUser", "--proxypassword="=>"ProxyPass", "--serverurl="=>"192.168.1.1"}}]
+      described_class.any_instance.should_receive(:run!).once.with(*run_options).and_return(double(:output => sample_output("subscription_manager/output_orgs")))
+      expect(described_class.new.organizations({:username=>"SomeUser", :password=>"SomePass", :proxy_address=>"1.2.3.4", :proxy_username=>"ProxyUser", :proxy_password=>"ProxyPass", :server_url=>"192.168.1.1"})).to eq({"SomeOrg"=>{:name=>"SomeOrg", :key=>"1234567"}})
+    end
+
+    it "with invalid credentials" do
+      run_options = ["subscription-manager orgs", {:params=>{"--username="=>"BadUser", "--password="=>"BadPass"}}]
+      described_class.any_instance.should_receive(:run).once.with(*run_options).and_return(CommandResult.new("", "Invalid username or password. To create a login, please visit https://www.redhat.com/wapps/ugc/register.html", 255))
+      expect { described_class.new.organizations({:username=>"BadUser", :password=>"BadPass"}) }.to raise_error(LinuxAdmin::CredentialError)
+    end
   end
 end

data/spec/system_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe LinuxAdmin::System do
   describe "#reboot!" do
     it "reboots the system" do
-      LinuxAdmin::System.should_receive(:run).
+      LinuxAdmin::System.should_receive(:run!).
          with(LinuxAdmin::System.cmd(:shutdown),
               :params => { '-r' => 'now'})
       LinuxAdmin::System.reboot!
@@ -12,7 +12,7 @@ describe LinuxAdmin::System do
 
   describe "#shutdown!" do
     it "shuts down the system" do
-      LinuxAdmin::System.should_receive(:run).
+      LinuxAdmin::System.should_receive(:run!).
          with(LinuxAdmin::System.cmd(:shutdown),
               :params => { '-h' => '0'})
       LinuxAdmin::System.shutdown!

data/spec/volume_group_spec.rb

@@ -20,7 +20,7 @@ eos
     it "uses lvextend" do
       lv = LinuxAdmin::LogicalVolume.new :name => 'lv'
       vg = described_class.new :name => 'vg'
-      vg.should_receive(:run).
+      vg.should_receive(:run!).
          with(vg.cmd(:lvextend),
               :params => ['lv', 'vg'])
       vg.attach_to(lv)
@@ -29,7 +29,7 @@ eos
     it "returns self" do
       lv = LinuxAdmin::LogicalVolume.new :name => 'lv'
       vg = described_class.new :name => 'vg'
-      vg.stub(:run)
+      vg.stub(:run!)
       vg.attach_to(lv).should == vg
     end
   end
@@ -38,7 +38,7 @@ eos
     it "uses vgextend" do
       vg = described_class.new :name => 'vg'
       pv = LinuxAdmin::PhysicalVolume.new :device_name => '/dev/hda'
-      vg.should_receive(:run).
+      vg.should_receive(:run!).
          with(vg.cmd(:vgextend),
               :params => ['vg', '/dev/hda'])
       vg.extend_with(pv)
@@ -47,7 +47,7 @@ eos
     it "assigns volume group to physical volume" do
       vg = described_class.new :name => 'vg'
       pv = LinuxAdmin::PhysicalVolume.new :device_name => '/dev/hda'
-      vg.stub(:run)
+      vg.stub(:run!)
       vg.extend_with(pv)
       pv.volume_group.should == vg
     end
@@ -55,7 +55,7 @@ eos
     it "returns self" do
       vg = described_class.new :name => 'vg'
       pv = LinuxAdmin::PhysicalVolume.new :device_name => '/dev/hda'
-      vg.stub(:run)
+      vg.stub(:run!)
       vg.extend_with(pv).should == vg
     end
   end
@@ -67,21 +67,21 @@ eos
 
     it "uses vgcreate" do
       described_class.instance_variable_set(:@vgs, [])
-      described_class.should_receive(:run).
+      described_class.should_receive(:run!).
                               with(LinuxAdmin.cmd(:vgcreate),
                                    :params => ['vg', '/dev/hda'])
       described_class.create 'vg', @pv
     end
 
     it "returns new volume group" do
-      described_class.stub(:run => "")
+      described_class.stub(:run! => double(:output => ""))
       vg = described_class.create 'vg', @pv
       vg.should be_an_instance_of(described_class)
       vg.name.should == 'vg'
     end
 
     it "adds volume group to local registry" do
-      described_class.stub(:run => "")
+      described_class.stub(:run! => double(:output => ""))
       vg = described_class.create 'vg', @pv
       described_class.scan.should include(vg)
     end
@@ -89,16 +89,15 @@ eos
 
   describe "#scan" do
     it "uses vgdisplay" do
-      described_class.should_receive(:run).
+      described_class.should_receive(:run!).
                               with(LinuxAdmin.cmd(:vgdisplay),
-                                   :return_output => true,
                                    :params => { '-c' => nil}).
-                                 and_return(@groups)
+                                 and_return(double(:output => @groups))
       described_class.scan
     end
 
     it "returns local volume groups" do
-      described_class.should_receive(:run).and_return(@groups)
+      described_class.should_receive(:run!).and_return(double(:output => @groups))
       vgs = described_class.scan
 
       vgs[0].should be_an_instance_of(described_class)

data/spec/yum_spec.rb

@@ -7,20 +7,20 @@ describe LinuxAdmin::Yum do
 
   context ".create_repo" do
     it "default arguments" do
-      described_class.should_receive(:run).once.with("yum createrepo", {:params=>{nil=>"some/path", "--database"=>nil, "--unique-md-filenames"=>nil}}).and_return true
-      expect(described_class.create_repo("some/path")).to be_true
+      described_class.should_receive(:run!).once.with("yum createrepo", {:params=>{nil=>"some/path", "--database"=>nil, "--unique-md-filenames"=>nil}})
+      described_class.create_repo("some/path")
     end
 
     it "bare create" do
-      described_class.should_receive(:run).once.with("yum createrepo", {:params=>{nil=>"some/path"}}).and_return true
-      expect(described_class.create_repo("some/path", :database => false, :unique_file_names => false)).to be_true
+      described_class.should_receive(:run!).once.with("yum createrepo", {:params=>{nil=>"some/path"}})
+      described_class.create_repo("some/path", :database => false, :unique_file_names => false)
     end
   end
 
   context ".download_packages" do
     it "with valid input" do
-      described_class.should_receive(:run).once.with("yum repotrack", {:params=>{"-p"=>"some/path", nil=>"pkg_a pkg_b"}}).and_return true
-      expect(described_class.download_packages("some/path", "pkg_a pkg_b")).to be_true
+      described_class.should_receive(:run!).once.with("yum repotrack", {:params=>{"-p"=>"some/path", nil=>"pkg_a pkg_b"}})
+      described_class.download_packages("some/path", "pkg_a pkg_b")
     end
 
     it "without mirror type" do
@@ -68,39 +68,39 @@ describe LinuxAdmin::Yum do
 
   context ".updates_available?" do
     it "check updates for a specific package" do
-      described_class.should_receive(:run).once.with("yum check-update", {:params=>{nil=>["abc"]}, :return_exitstatus=>true}).and_return(100)
+      described_class.should_receive(:run).once.with("yum check-update", {:params=>{nil=>["abc"]}}).and_return(double(:exit_status => 100))
       expect(described_class.updates_available?("abc")).to be_true
     end
 
     it "updates are available" do
-      described_class.stub(:run => 100)
+      described_class.stub(:run => double(:exit_status => 100))
       expect(described_class.updates_available?).to be_true
     end
 
     it "updates not available" do
-      described_class.stub(:run => 0)
+      described_class.stub(:run => double(:exit_status => 0))
       expect(described_class.updates_available?).to be_false
     end
 
     it "other exit code" do
-      described_class.stub(:run => 255)
+      described_class.stub(:run => double(:exit_status => 255))
       expect { described_class.updates_available? }.to raise_error
     end
 
     it "other error" do
       described_class.stub(:run).and_raise(RuntimeError)
-      expect { described_class.updates_available? }.to raise_error
+      expect { described_class.updates_available? }.to raise_error(RuntimeError)
     end
   end
 
   context ".update" do
     it "no arguments" do
-      described_class.should_receive(:run).once.with("yum -y update", {:params=>nil}).and_return(0)
+      described_class.should_receive(:run!).once.with("yum -y update", {:params=>nil})
       described_class.update
     end
 
     it "with arguments" do
-      described_class.should_receive(:run).once.with("yum -y update", {:params=>{nil=>["1 2", "3"]}}).and_return(0)
+      described_class.should_receive(:run!).once.with("yum -y update", {:params=>{nil=>["1 2", "3"]}})
       described_class.update("1 2", "3")
     end
   end
@@ -111,7 +111,7 @@ describe LinuxAdmin::Yum do
     end
 
     it "with packages" do
-      described_class.should_receive(:run).once.with("repoquery --qf=\"%{name} %{version}\"", {:params=>{nil=>["curl"]}, :return_output=>true}).and_return(sample_output("yum/output_repoquery"))
+      described_class.should_receive(:run!).once.with("repoquery --qf=\"%{name} %{version}\"", {:params=>{nil=>["curl"]}}).and_return(double(:output => sample_output("yum/output_repoquery")))
       expect(described_class.version_available("curl")).to eq({
         "curl"                  => "7.19.7",
         "subscription-manager"  => "1.1.23.1",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: linux_admin
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-15 00:00:00.000000000 Z
+date: 2013-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -168,6 +168,7 @@ files:
 - Rakefile
 - examples/subscription_manager_hosted.rb
 - lib/linux_admin.rb
+- lib/linux_admin/command_result.rb
 - lib/linux_admin/common.rb
 - lib/linux_admin/disk.rb
 - lib/linux_admin/distro.rb