Revert "do not stage if staging or staged"

We are in a weird state right now in Azure.
Once we are in a 'clean' state with no staged
image we will put this check in.

This reverts commit 8e95fa4.

Author: bot

lib/stemcell/publisher/azure.rb

@@ -29,7 +29,6 @@ def finalize
 
       def publish
         status = poll_status('staging')
-        puts "staging status: #{status}"
         if status == 'Staged'
           post(base_url+'list', '')
         else
@@ -38,14 +37,6 @@ def publish
       end
 
       def stage
-        if(is_staging)
-          raise "an offer is staging"
-        end
-
-        if(is_staged)
-          raise "an offer is staged"
-        end
-
         response = get(base_url)
         unless response.kind_of? Net::HTTPSuccess
           raise "could not obtain offer data. expected 200 but got '#{response.code}'"
@@ -70,7 +61,13 @@ def base_url
         def poll_status(mode)
           status = ''
           while true
-            status = get_status(mode)
+            response = get(base_url+'progress')
+            unless response.kind_of? Net::HTTPSuccess
+              raise "could not obtain progress data. expected 200 but got '#{response.code}'"
+            end
+            response_body = JSON.parse(response.body)
+            status = response_body[mode]['State']
+            puts "#{mode} status: #{status}"
             break if status != 'InProgress'
             puts "#{Time.now} Starting to sleep for an hour"
             sleep 60 * 60
@@ -79,25 +76,6 @@ def poll_status(mode)
           return status
         end
 
-        def get_status(mode)
-            response = get(base_url+'progress')
-            unless response.kind_of? Net::HTTPSuccess
-              raise "could not obtain progress data. expected 200 but got '#{response.code}'"
-            end
-            response_body = JSON.parse(response.body)
-            response_body[mode]['State']
-        end
-
-        def is_staged()
-          status = get_status('staging')
-          status == 'Staged'
-        end
-
-        def is_staging()
-          status = get_status('staging')
-          status == 'InProgress'
-        end
-
         def json(response_string)
           response_json = JSON.parse(response_string)
           json = response_json['Offer']

spec/stemcell/publisher/azure_spec.rb

@@ -280,21 +280,6 @@
       stub_request(:get, @publisher.base_url).to_return(status: 200, body: response)
       stub_request(:post, @publisher.base_url+'update').to_return(status: 200)
       stub_request(:post, @publisher.base_url+'stage').to_return(status: 202)
-      stub_request(:get, @publisher.base_url+'progress').to_return(status: 200, body: '{"staging":{"State":"whatever the state of an unstaged thing is"}}')
-    end
-
-    it 'does not try to stage if an offer is already staged' do
-      staged_response = '{"staging":{"State":"Staged"}}'
-      stub_request(:get, @publisher.base_url+'progress').to_return(status: 200, body: staged_response)
-
-      expect{@publisher.stage}.to raise_error('an offer is staged')
-    end
-
-    it 'does not try to stage if an offer is staging' do
-      staged_response = '{"staging":{"State":"InProgress"}}'
-      stub_request(:get, @publisher.base_url+'progress').to_return(status: 200, body: staged_response)
-
-      expect{@publisher.stage}.to raise_error('an offer is staging')
     end
 
     it 'does not print the API key to stdout or stderr' do