cloudfactory 0.1.5 → 0.1.6

data/bin/cf

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
 
-ENV['BUNDLE_GEMFILE'] = File.expand_path('../../Gemfile', __FILE__)
+# ENV['BUNDLE_GEMFILE'] = File.expand_path('../../Gemfile', __FILE__)
 require 'rubygems' unless defined?(Gem)
-require 'bundler/setup'
+# require 'bundler/setup'
 
 lib = File.expand_path(File.dirname(__FILE__) + '/../lib')
 $LOAD_PATH.unshift(lib) if File.directory?(lib) && !$LOAD_PATH.include?(lib)

data/lib/cf/cli/config.rb

@@ -42,25 +42,26 @@ module Cf
     
     def get_api_key(yaml_file)
       yml = YAML::load(File.read(yaml_file))
-      yml['api_key'].presence
+      yml[:api_key].presence || yml['api_key'].presence
     end
     
     def set_api_key(yaml_source)
-      api_key = get_api_key(yaml_source)
+      api_key = nil
+      api_key = get_api_key(yaml_source) if File.exists?(yaml_source)
       if api_key.blank?
         
         # api_key not found in line.yml file, so checking in the .cf_credentials
         if File.exist?(config_file)
           api_key = get_api_key(config_file)
           if api_key.blank?
-            return false
+            raise "Error: No valid api key found. Do login first with: cf login"
           else
             CF.api_key = api_key if CF.api_key.blank?
             raise "Error: Invalid api key => #{CF.api_key} for target #{CF.api_url}" unless CF::Account.valid?
             return true
           end
         end
-        return false
+        raise "Error: No valid api key found. Do login first with: cf login"
       else
         CF.api_key = api_key if CF.api_key.blank?
         # Do check whether the api_key is valid by calling the CF::Account#valid?

data/lib/cf/cli/line.rb

@@ -33,7 +33,7 @@ module Cf
 
     def generate(title=nil)
       if title.present?
-        line_destination = "#{title.underscore.dasherize}"
+        line_destination = "#{title.parameterize}"
         yaml_destination = "#{line_destination}/line.yml"
         FileUtils.rm_rf(line_destination, :verbose => true) if options.force? && File.exist?(line_destination)
         if File.exist?(line_destination)
@@ -59,16 +59,13 @@ module Cf
       end
 
       set_target_uri(false)
-      if set_api_key(yaml_source)
-        CF.account_name = CF::Account.info.name
-        line_dump = YAML::load(File.open(yaml_source))
-        line_title = line_dump['title']
+      set_api_key(yaml_source)
+      CF.account_name = CF::Account.info.name
+      line_dump = YAML::load(File.open(yaml_source))
+      line_title = line_dump['title'].parameterize
 
-        CF::Line.destroy(line_title)
-        say("The line #{line_title} was deleted successfully!", :yellow)
-      else
-        say("The api_key is missing in the line.yml file", :red)
-      end
+      CF::Line.destroy(line_title)
+      say("The line #{line_title} was deleted successfully!", :yellow)
     end
 
     desc "line create", "takes the yaml file at line.yml and creates a new line at http://cloudfactory.com"
@@ -82,7 +79,7 @@ module Cf
       end
 
       set_target_uri(false)
-      if set_api_key(yaml_source)
+      set_api_key(yaml_source)
 
         CF.account_name = CF::Account.info.name
 
@@ -193,9 +190,6 @@ module Cf
         say "View your line at http://#{CF.account_name}.#{CF.api_url.split("/")[-2]}/lines/#{CF.account_name}/#{line.title}", :yellow
         say "\nNow you can do production runs with: cf production start <your_run_title>", :green
         say "Note: Make sure your-run-title.csv file is in the input directory.", :green
-      else
-        say "The api_key is missing in the line.yml file", :red
-      end
     end
 
     desc "line list", "List your lines"
@@ -203,28 +197,21 @@ module Cf
       line_source = Dir.pwd
       yaml_source = "#{line_source}/line.yml"
 
-      unless File.exist?(yaml_source)
-        say("The line.yml file does not exist in this directory", :red) and return
-      end
-
       set_target_uri(false)
-      if set_api_key(yaml_source)
-        CF.account_name = CF::Account.info.name
-        lines = CF::Line.all
-        lines.sort! {|a, b| a[:name] <=> b[:name] }
-        say "\n"
-        say("No Lines", :yellow) if lines.blank?
-
-        lines_table = table do |t|
-          t.headings = ["Line Title", 'URL']
-          lines.each do |line|
-            t << [line.title, "http://#{CF.account_name}.cloudfactory.com/lines/#{CF.account_name}/#{line.title.parameterize}"]
-          end
+      set_api_key(yaml_source)
+      CF.account_name = CF::Account.info.name
+      lines = CF::Line.all
+      lines.sort! {|a, b| a[:name] <=> b[:name] }
+      say "\n"
+      say("No Lines", :yellow) if lines.blank?
+
+      lines_table = table do |t|
+        t.headings = ["Line Title", 'URL']
+        lines.each do |line|
+          t << [line.title, "http://#{CF.account_name}.cloudfactory.com/lines/#{CF.account_name}/#{line.title.parameterize}"]
         end
-        say(lines_table)
-      else
-        say("The api_key is missing in the line.yml file", :red)
       end
+      say(lines_table)
     end
 
     # helper function like in Rails

data/lib/cf/line.rb

@@ -40,7 +40,7 @@ module CF
       @stations =[]
       @title = title
       @department_name = department_name
-      @public = options[:public]
+      @public = options[:public].present? ? options[:public] : false
       @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

data/lib/cf/version.rb

@@ -1,3 +1,3 @@
 module CF
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudfactory
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-08-08 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2157320800 !ruby/object:Gem::Requirement
+  requirement: &2156790380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157320800
+  version_requirements: *2156790380
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2157320240 !ruby/object:Gem::Requirement
+  requirement: &2156789740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *2157320240
+  version_requirements: *2156789740
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &2157319700 !ruby/object:Gem::Requirement
+  requirement: &2156789200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2157319700
+  version_requirements: *2156789200
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &2157319260 !ruby/object:Gem::Requirement
+  requirement: &2156788740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157319260
+  version_requirements: *2156788740
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2157318720 !ruby/object:Gem::Requirement
+  requirement: &2156788160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157318720
+  version_requirements: *2156788160
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2157318100 !ruby/object:Gem::Requirement
+  requirement: &2156787540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *2157318100
+  version_requirements: *2156787540
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &2157317680 !ruby/object:Gem::Requirement
+  requirement: &2156787040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157317680
+  version_requirements: *2156787040
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &2157317080 !ruby/object:Gem::Requirement
+  requirement: &2156786340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 0.7.8
   type: :runtime
   prerelease: false
-  version_requirements: *2157317080
+  version_requirements: *2156786340
 - !ruby/object:Gem::Dependency
   name: terminal-table
-  requirement: &2157316500 !ruby/object:Gem::Requirement
+  requirement: &2156785720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 1.4.2
   type: :runtime
   prerelease: false
-  version_requirements: *2157316500
+  version_requirements: *2156785720
 - !ruby/object:Gem::Dependency
   name: millisami-csv-hash
-  requirement: &2157316060 !ruby/object:Gem::Requirement
+  requirement: &2156785220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157316060
+  version_requirements: *2156785220
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &2157315580 !ruby/object:Gem::Requirement
+  requirement: &2156784640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157315580
+  version_requirements: *2156784640
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2157314900 !ruby/object:Gem::Requirement
+  requirement: &2156784020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,10 +142,10 @@ dependencies:
         version: 3.0.3
   type: :development
   prerelease: false
-  version_requirements: *2157314900
+  version_requirements: *2156784020
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2157314320 !ruby/object:Gem::Requirement
+  requirement: &2156783400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -153,10 +153,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2157314320
+  version_requirements: *2156783400
 - !ruby/object:Gem::Dependency
   name: generator_spec
-  requirement: &2157313740 !ruby/object:Gem::Requirement
+  requirement: &2156782820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -164,10 +164,10 @@ dependencies:
         version: 0.8.3
   type: :development
   prerelease: false
-  version_requirements: *2157313740
+  version_requirements: *2156782820
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &2157313220 !ruby/object:Gem::Requirement
+  requirement: &2156782440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +175,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157313220
+  version_requirements: *2156782440
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2157312740 !ruby/object:Gem::Requirement
+  requirement: &2156781860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,10 +186,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157312740
+  version_requirements: *2156781860
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2157312100 !ruby/object:Gem::Requirement
+  requirement: &2156781360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -197,10 +197,10 @@ dependencies:
         version: 3.5.3
   type: :development
   prerelease: false
-  version_requirements: *2157312100
+  version_requirements: *2156781360
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &2157311640 !ruby/object:Gem::Requirement
+  requirement: &2156780920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -208,10 +208,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157311640
+  version_requirements: *2156780920
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2157310940 !ruby/object:Gem::Requirement
+  requirement: &2156780340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -219,10 +219,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157310940
+  version_requirements: *2156780340
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &2157310400 !ruby/object:Gem::Requirement
+  requirement: &2156779880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -230,7 +230,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157310400
+  version_requirements: *2156779880
 description: A Ruby wrapper and CLI for to interact with Cloudfactory.com REST API
 email:
 - info@cloudfactory.com