Refactor CREDENTIALS_FILE

.gitignore

@@ -6,3 +6,4 @@ Gemfile.lock
 .yardoc/
 *.png
 suse-connect-*.gem
+.vagrant/

lib/suse/connect.rb

@@ -6,7 +6,7 @@ module Connect
     UUIDGEN_LOCATION        = '/usr/bin/uuidgen'
     ZYPPER_CREDENTIALS_DIR  = '/etc/zypp/credentials.d'
     CREDENTIALS_NAME        = 'SCCcredentials'
-    NCC_CREDENTIALS_FILE    = File.join(ZYPPER_CREDENTIALS_DIR, CREDENTIALS_NAME)
+    CREDENTIALS_FILE        = File.join(ZYPPER_CREDENTIALS_DIR, CREDENTIALS_NAME)
 
     require 'suse/connect/version'
     require 'suse/connect/logger'

lib/suse/connect/system.rb

@@ -40,9 +40,9 @@ def hwinfo
         # tuple of username and password or nil for both values
         #
         def credentials
-          if File.exist?(NCC_CREDENTIALS_FILE)
+          if File.exist?(CREDENTIALS_FILE)
 
-            file = File.new(NCC_CREDENTIALS_FILE, 'r')
+            file = File.new(CREDENTIALS_FILE, 'r')
 
             begin
               lines = file.readlines.map(&:chomp)

lib/suse/toolkit/system_calls.rb

@@ -12,7 +12,7 @@ def call_with_output(command)
       end
 
       def write_credentials_file(login, password, filename)
-        credentials_dir = ZYPPER_CREDENTIALS_DIR
+        credentials_dir = SUSE::Connect::ZYPPER_CREDENTIALS_DIR
         Dir.mkdir(credentials_dir) unless Dir.exists?(credentials_dir)
         credentials_file = File.join(credentials_dir, filename)
 

spec/connect/system_spec.rb

@@ -86,8 +86,8 @@
       end
 
       before do
-        File.should_receive(:exist?).with(NCC_CREDENTIALS_FILE).and_return(true)
-        File.should_receive(:new).with(NCC_CREDENTIALS_FILE, 'r').and_return(stub_ncc_cred_file)
+        File.should_receive(:exist?).with(CREDENTIALS_FILE).and_return(true)
+        File.should_receive(:new).with(CREDENTIALS_FILE, 'r').and_return(stub_ncc_cred_file)
       end
 
       it 'should raise MalformedNccCredentialsFile if cannot parse lines' do
@@ -106,7 +106,7 @@
     context :credentials_not_exist do
 
       before(:each) do
-        File.should_receive(:exist?).with(NCC_CREDENTIALS_FILE).and_return(false)
+        File.should_receive(:exist?).with(CREDENTIALS_FILE).and_return(false)
       end
 
       it 'should produce log message' do