cloudfactory 0.3.1 → 0.4.0

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.4.0 (2011-10-1)
+
+* removed the hashie from the client response that was causing problem while debugging and the response was pretty messed up
+* cli code changed as well to adapt with the hashie removal
+
 ## 0.3.1 (2011-09-22)
 
 * added --live option while adding units to existing production run

data/lib/cf/account.rb

@@ -12,10 +12,7 @@ module CF
       #   CF::Account.info
       def info
         resp = get('/account.json')
-
-        if resp.code != 200
-          self.errors = resp.error.message
-        end
+        self.errors = resp['error']['message'] if resp['code'] != 200
         return resp
       end
 
@@ -32,8 +29,8 @@ module CF
       #   CF::Account.login("sprout@sprout-technology.com", "password")
       def login(email, passwd)
         resp = post('/account_login.json', :user => {:email => email, :password => passwd})
-        self.errors = resp.error.message if resp.code != 200
-        resp
+        self.errors = resp['error']['message'] if resp['code'] != 200
+        return resp
       end
     end
   end

data/lib/cf/cli.rb

@@ -45,11 +45,11 @@ module Cf # :nodoc: all
       set_target_uri(false)
       resp = CF::Account.login(email, passwd)
 
-      if resp.error.blank? and resp.api_key.present?
-        File.open(config_file, 'w') {|f| f.write("#Don't change this file unless you know what you're doing\n" + { :target_url => CF.api_url, :api_version => CF.api_version, :api_key => resp.api_key, :account_name => resp.account_name, :email => email.strip }.to_yaml) }
+      if resp['error'].blank? and resp['api_key'].present?
+        File.open(config_file, 'w') {|f| f.write("#Don't change this file unless you know what you're doing\n" + { :target_url => CF.api_url, :api_version => CF.api_version, :api_key => resp['api_key'], :account_name => resp['account_name'], :email => email.strip }.to_yaml) }
         say("\nNow you're logged in.\nTo get started, run cf help\n", :green)
       else
-        say("\n#{resp.error.message}\nTry again with valid one.\n", :red)
+        say("\n#{resp['error']['message']}\nTry again with valid one.\n", :red)
       end
     end
 
@@ -113,7 +113,7 @@ module Cf # :nodoc: all
         set_api_key(yaml_source)
         CF.account_name = CF::Account.info.name
         run = CF::Run.find(run_title)
-        if run.errors.blank?
+        if run['errors'].blank?
           say("Fetching output for run: #{run_title}", :green)
 
           if options[:station_index].present?
@@ -123,13 +123,9 @@ module Cf # :nodoc: all
             # Ouput for the whole production run
             output = CF::Run.final_output(run_title)
           end
-          res_array = []
-          output.each do |o|
-            res_array << o.to_hash
-          end
-          if !res_array.empty?
-            res_array.each 
-            csv_str = CSVHash(res_array,res_array.first.keys)
+          if !output.empty?
+            output.each 
+            csv_str = CSVHash(output,output.first.keys)
             csv_str = csv_str.gsub("\"\"", '"')
             FileUtils.mkdir("#{line_source}/output") unless Dir.exist?("#{line_source}/output") if RUBY_VERSION > "1.9"
             FileUtils.mkdir("#{line_source}/output") unless File.directory?("#{line_source}/output") if RUBY_VERSION < "1.9"
@@ -140,7 +136,7 @@ module Cf # :nodoc: all
             say("Run not completed yet", :red)
           end
         else
-          say("Error: #{run.errors.inspect}", :red)
+          say("Error: #{run['errors'].inspect}", :red)
         end
 
       else

data/lib/cf/cli/line.rb

@@ -61,13 +61,13 @@ module Cf # :nodoc: all
         say("The line.yml file does not exist in this directory", :red) and exit(1) unless File.exist?(yaml_source)
         set_target_uri(false)
         set_api_key(yaml_source)
-        CF.account_name = CF::Account.info.name
+        CF.account_name = CF::Account.info['name']
         line_dump = YAML::load(File.read(yaml_source).strip)
         line_title = line_dump['title'].parameterize
       else
         set_target_uri(false)
         set_api_key
-        CF.account_name = CF::Account.info.name
+        CF.account_name = CF::Account.info['name']
         line_title = options['line'].parameterize
       end
 
@@ -92,7 +92,7 @@ module Cf # :nodoc: all
             say("\n")
             if delete_forcefully
               resp = CF::Line.destroy(line_title, :forced => true)
-              if resp.code != 200
+              if resp['code'] != 200
                 say("Error: #{resp.error.message}\n", :red)
               else
                 say("The line #{line_title} deleted successfully!\n", :yellow)
@@ -114,8 +114,8 @@ module Cf # :nodoc: all
       # method to call with line title to delete the line if validation fails during the creation of line
       def rollback(line_title)
         deleted_resp = CF::Line.destroy(line_title)
-        if !deleted_resp.error.nil?
-          if deleted_resp.error.message == "Cannot delete line. You have production runs using this line. Pass force option to enforce deletion."
+        if !deleted_resp['error'].nil?
+          if deleted_resp['error']['message'] == "Cannot delete line. You have production runs using this line. Pass force option to enforce deletion."
             say("!!! Warning !!!\nThe following are the existing production runs based on this line.", :yellow)
             existing_runs = Cf::Production.new([],{'line' => line_title, 'all' => true})
             existing_runs.list
@@ -125,7 +125,7 @@ module Cf # :nodoc: all
             say("\n")
             if delete_forcefully
               resp = CF::Line.destroy(line_title, :forced => true)
-              if resp.code != 200
+              if resp['code'] != 200
                 say("Error: #{resp.error.message}\n", :red)
               end
             else
@@ -163,7 +163,7 @@ module Cf # :nodoc: all
       set_target_uri(false)
       set_api_key(yaml_source)
 
-        CF.account_name = CF::Account.info.name
+        CF.account_name = CF::Account.info['name']
 
         line_dump = YAML::load(File.read(yaml_source).strip)
         line_title = line_dump['title'].parameterize
@@ -172,14 +172,14 @@ module Cf # :nodoc: all
         line_public = line_dump['public']
         
         line = CF::Line.info(line_title)
-        if line.error.blank? && options.force? 
+        if line['error'].blank? && options.force? 
           rollback(line.title)
-        elsif line.error.blank?
+        elsif line['error'].blank?
           say("This line already exist.", :yellow)
           override = agree("Do you want to override? [y/n] ")
           if override
             say("Deleting the line forcefuly..", :yellow)
-            rollback(line.title)
+            rollback(line['title'])
           else
             say("Line creation aborted!!", :yellow) and exit(1)
           end
@@ -324,7 +324,7 @@ module Cf # :nodoc: all
 
       set_target_uri(false)
       set_api_key(yaml_source)
-      CF.account_name = CF::Account.info.name
+      CF.account_name = CF::Account.info['name']
       
       if options.all
         resp_lines = CF::Line.all(:page => 'all')
@@ -375,14 +375,14 @@ module Cf # :nodoc: all
         say("The line.yml file does not exist in this directory", :red) and exit(1) unless File.exist?(yaml_source)
         set_target_uri(false)
         set_api_key(yaml_source)
-        CF.account_name = CF::Account.info.name
+        CF.account_name = CF::Account.info['name']
 
         line_dump = YAML::load(File.read(yaml_source).strip)
         line_title = line_dump['title'].parameterize
       else
         set_target_uri(false)
         set_api_key
-        CF.account_name = CF::Account.info.name
+        CF.account_name = CF::Account.info['name']
         line_title = options['line'].parameterize
       end
       

data/lib/cf/cli/production.rb

@@ -20,7 +20,7 @@ module Cf # :nodoc: all
 
       set_target_uri(options[:live])
       set_api_key
-      CF.account_name = CF::Account.info.name
+      CF.account_name = CF::Account.info['name']
 
       if options[:line].present?
         line = CF::Line.find(options[:line])
@@ -116,7 +116,7 @@ module Cf # :nodoc: all
     def list
       set_target_uri(options[:live])
       set_api_key
-      CF.account_name = CF::Account.info.name
+      CF.account_name = CF::Account.info['name']
       param = {}
       current_page = 1
 
@@ -181,15 +181,15 @@ module Cf # :nodoc: all
     def resume
       set_target_uri(false)
       set_api_key
-      CF.account_name = CF::Account.info.name
+      CF.account_name = CF::Account.info['name']
       result = CF::Run.resume(options['run_title'].parameterize)
 
-      if result.error.present?
-        say("Error: #{result.error.message}", :red) and exit(1)
+      if result['error'].present?
+        say("Error: #{result['error']['message']}", :red) and exit(1)
       end
 
       # if result.status == "resumed"
-      say("Run with title \"#{result.title}\" is resumed!", :green)
+      say("Run with title \"#{result['title']}\" is resumed!", :green)
       # end
     end   
 
@@ -200,7 +200,7 @@ module Cf # :nodoc: all
     def add_units
       set_target_uri(options[:live])
       set_api_key
-      CF.account_name = CF::Account.info.name
+      CF.account_name = CF::Account.info['name']
       run_title = options[:run_title].parameterize
       input_data = options[:input_data].presence
 
@@ -213,10 +213,14 @@ module Cf # :nodoc: all
         input_data_file = "#{Dir.pwd}/#{input_data}"
       end
       units = CF::Run.add_units({:run_title => run_title, :file => input_data_file})
-      if units['error'].present?
-        say("Error: #{units['error']['message']}", :red) and exit(1)
+      if units.nil?
+        say("Error: Invalid File!", :red) and exit(1)
+      else
+        if units['error'].present? 
+          say("Error: #{units['error']['message']}", :red) and exit(1)
+        end
+        say("\"#{units['successfull']}\"!", :green)
       end
-      say("\"#{units['successfull']}\"!", :green)
     end 
 
     desc "production delete", "Deletes created Production Run"
@@ -224,14 +228,14 @@ module Cf # :nodoc: all
     def delete
       set_target_uri(false)
       set_api_key
-      CF.account_name = CF::Account.info.name
+      CF.account_name = CF::Account.info['name']
       run_title = options[:run_title].parameterize
       
       deleted_run = CF::Run.destroy(run_title)
-      if deleted_run.error.present?
-        say("Error: #{deleted_run.error.message}", :red) and exit(1)
+      if deleted_run['error'].present?
+        say("Error: #{deleted_run['error']['message']}", :red) and exit(1)
       end
-      say("Run Deleted Successfully entitled: \"#{deleted_run.title}\"!", :green)
+      say("Run Deleted Successfully entitled: \"#{deleted_run['title']}\"!", :green)
     end 
   end
 end

data/lib/cf/client.rb

@@ -37,27 +37,17 @@ module CF # :nodoc: all
       end
 
       def handle_response(response)
-        # FIX: raise the exception along with the response error message
-        # Ref: http://www.simonecarletti.com/blog/2009/12/inside-ruby-on-rails-rescuable-and-rescue_from/
-        # case response.code
-        # when 401; raise Unauthorized.new
-        # when 403; raise RateLimitExceeded.new
-        # when 404; raise ::CF::NotFound.new(response)
-        # when 400...500; raise ClientError.new
-        # when 500...600; raise ServerError.new(response.code)
-        # else; response
-        # end
         unless response.length == 2
           parsed_response = JSON.load(response)
           if parsed_response.is_a?(Array)
-            parsed_response.map{|item| Hashie::Mash.new(item)}
+            return parsed_response
           else
             parsed_resp = parsed_response.merge("code" => response.code)
             new_response = parsed_resp.inject({ }) do |x, (k,v)|
               x[k.sub(/\A_/, '')] = v
               x
             end
-            Hashie::Mash.new(new_response)
+            return new_response
           end
         else
           JSON.load(response)

data/lib/cf/custom_task_form.rb

@@ -43,9 +43,7 @@ module CF
         resp.to_hash.each_pair do |k,v|
           self.send("#{k}=",v) if self.respond_to?(k)
         end
-        if resp.code != 200
-          self.errors = resp.error.message
-        end
+        self.errors = resp['error']['message'] if resp['code'] != 200
         @station.form = self
         return self
       end

data/lib/cf/input_format.rb

@@ -49,9 +49,7 @@ module CF
         @resp.to_hash.each_pair do |k,v|
           self.send("#{k}=",v) if self.respond_to?(k)
         end
-        if @resp.code != 200
-          self.errors = @resp.error.message
-        end
+        self.errors = @resp['error']['message'] if @resp['code'] != 200
         @line_title = line_title
         if !@station.nil? && @station.except.nil? && @station.extra.nil?
           @station.input_formats = self

data/lib/cf/line.rb

@@ -43,9 +43,8 @@ module CF
       @public = options[:public].nil? ? true : options[:public]
       @description = options[:description]
       resp = self.class.post("/lines/#{CF.account_name}.json", {:line => {:title => title, :department_name => department_name, :public => @public, :description => @description}})
-      if resp.code != 200
-        self.errors = resp.error.message
-      end
+      self.errors = resp['error']['message'] if resp['code'] != 200
+      return resp
     end
 
     # ==Adds station in a line
@@ -128,9 +127,7 @@ module CF
           station.batch_size = @batch_size
           station.line = self
           station.line_title = self.title
-          if resp.response.code != "200"
-            station.errors = resp.parsed_response['error']['message']
-          end
+          station.errors = resp.parsed_response['error']['message'] if resp.response.code != "200"
           @stations << station
         end
       else
@@ -191,9 +188,7 @@ module CF
         @resp.each_pair do |k,v|
           input_format.send("#{k}=",v) if input_format.respond_to?(k)
         end
-        if @resp.code != 200
-          input_format.errors = @resp.error.message
-        end
+        input_format.errors = @resp['error']['message'] if @resp['code'] != 200
         @input_formats << input_format
       else
         @input_formats
@@ -242,7 +237,7 @@ module CF
       else
         resp = get("/lines/#{CF.account_name}/#{line.downcase}.json")
       end
-      @errors = resp.error.message if resp.code != 200
+      @errors = resp['error']['message'] if resp['code'] != 200
       return resp
     end
 
@@ -263,8 +258,8 @@ module CF
           resp = get("/lines/#{CF.account_name}/#{line.downcase}.json")
         end
       end
-      @errors = resp.error.message if resp.code != 200
-      return resp.to_hash
+      @errors = resp['error']['message'] if resp['code'] != 200
+      return resp
     end
     
     # ==Returns all the lines of an account
@@ -279,17 +274,17 @@ module CF
       else
         resp = get("/lines/#{CF.account_name}.json")
       end
-      @errors = resp.error.message if resp.code != 200
-      new_resp = []
-      if resp.lines
-        if resp.lines.count > 0
-          resp.lines.each do |l|
-            new_resp << l.to_hash
-          end
-        end
-      end
-      send_resp = {"lines" => new_resp, "total_pages" => resp.total_pages, "total_lines" => resp.total_lines}
-      return send_resp
+      @errors = resp['error']['message'] if resp['code'] != 200
+      # new_resp = []
+      #      if resp['lines']
+      #        if resp['lines'].count > 0
+      #          resp['lines'].each do |l|
+      #            new_resp << l.to_hash
+      #          end
+      #        end
+      #      end
+      #      send_resp = {"lines" => new_resp, "total_pages" => resp.total_pages, "total_lines" => resp.total_lines}
+      return resp
     end
     
     # ==Returns all the stations of a line
@@ -301,9 +296,13 @@ module CF
     # ==Return all the public lines
     # ===Usage Example:
     #   CF::Line.public_lines
-    def self.public_lines
-      resp = get("/public_lines.json")
-      resp.lines
+    def self.public_lines(options={})
+      if options[:page]=="all"
+        resp = get("/public_lines.json", :page => "all")
+      else
+        resp = get("/public_lines.json")
+      end
+      return resp['lines']
     end
 
     # ==Updates a line
@@ -331,9 +330,7 @@ module CF
       else
         resp = self.class.delete("/lines/#{CF.account_name}/#{self.title.downcase}.json")
       end
-      if resp.code != 200
-        self.errors = resp.errors.message
-      end
+      self.errors = resp['error']['message'] if resp['code'] != 200
       return resp
     end
     
@@ -348,7 +345,7 @@ module CF
       else
         resp = delete("/lines/#{CF.account_name}/#{title.downcase}.json")
       end
-      @errors = resp.error.message if resp.code != 200
+      @errors = resp['error']['message'] if resp['code'] != 200
       return resp
     end
     
@@ -357,42 +354,42 @@ module CF
     #   line = CF::Line.inspect("line_title")
     def self.inspect(line_title)
       resp = get("/lines/#{CF.account_name}/#{line_title.downcase}/inspect.json")
-      @errors = resp.error.message if resp.code != 200
-      if resp.code == 200
-        send_resp = resp.to_hash
-        @line_input_formats = []
-        resp.input_formats.each do |l_i|
-          @line_input_formats << l_i.to_hash
-        end
-        send_resp.delete("input_formats")
-        send_resp.merge!("input_formats" => @line_input_formats)
-        @stations = []
-      
-        resp.stations.each do |s|
-          @station_input_formats = []
-          s.input_formats.each do |i|
-            @station_input_formats << i.to_hash
-          end
-          @station_form_fields = []
-          @temp_station = s.to_hash
-          if !s.form_fields.nil?
-            s.form_fields.each do |f|
-              @station_form_fields << f.to_hash
-            end
-            @temp_station.delete("form_fields")
-            @temp_station.merge!("form_fields" => @station_form_fields)
-          end
-          @temp_station.delete("input_formats")
-          @temp_station.merge!("input_formats" => @station_input_formats)
-          @stations << @temp_station
-        end
-      
-        send_resp.delete("stations")
-        send_resp.merge!("stations" => @stations)
-        send_resp
-      else
-        resp
-      end
+      @errors = resp['error']['message'] if resp['code'] != 200
+      # if resp['code'] == 200
+      #         send_resp = resp.to_hash
+      #         # @line_input_formats = []
+      #         #        resp.input_formats.each do |l_i|
+      #         #          @line_input_formats << l_i.to_hash
+      #         #        end
+      #         #        send_resp.delete("input_formats")
+      #         #        send_resp.merge!("input_formats" => @line_input_formats)
+      #         # @stations = []
+      #       
+      #         # resp.stations.each do |s|
+      #         #           @station_input_formats = []
+      #         #           s.input_formats.each do |i|
+      #         #             @station_input_formats << i.to_hash
+      #         #           end
+      #         #           @station_form_fields = []
+      #         #           @temp_station = s.to_hash
+      #         #           if !s.form_fields.nil?
+      #         #             s.form_fields.each do |f|
+      #         #               @station_form_fields << f.to_hash
+      #         #             end
+      #         #             @temp_station.delete("form_fields")
+      #         #             @temp_station.merge!("form_fields" => @station_form_fields)
+      #         #           end
+      #         #           @temp_station.delete("input_formats")
+      #         #           @temp_station.merge!("input_formats" => @station_input_formats)
+      #         #           @stations << @temp_station
+      #         #         end
+      #               # 
+      #               # send_resp.delete("stations")
+      #               # send_resp.merge!("stations" => @stations)
+      #         send_resp
+      #       else
+      return resp
+      # end
     end
   end
 end