fastly 0.95 → 0.96

data/bin/fastly_upload_vcl

@@ -46,22 +46,23 @@ die("Couldn't find any of the config files - #{configs.join(',')}") unless param
 die("Couldn't find vcl file #{vcl_file}") unless File.file?(vcl_file)
 
 fastly  = Fastly.new(params) 
+
 service = fastly.get_service(service_id) || die("Couldn't find service #{service_id}")
-old     = service.version
-updated = old.clone
-puts "Uploading #{vcl_file} and bumping version from #{old.number} to #{updated.number}"
+version = service.version
+die "Can't upload a vcl file to the last (#{version.number}) version of #{service.name} (#{service.id}) because it's locked" if version.locked?
+puts "Uploading #{vcl_file} to version #{version.number}"
 begin
   name    = File.basename(vcl_file, ".vcl")
   content = File.new(vcl_file, "r").read
-  vcl     = updated.vcl(name)
+  vcl     = version.vcl(name)
   if vcl
     vcl.content = content
     vcl.save!
   else
-    updated.upload_vcl(name, content)
+    version.upload_vcl(name, content)
   end
-  updated.activate!
+  # version.activate!
 rescue => e
-  die("Couldn't upload and activate vcl: #{e}")
+  die("Couldn't upload vcl: #{e}")
 end
-puts "Done!"
+puts "Done! You should now go and activate it at https://app.fastly.com/#configure"

data/lib/fastly.rb

@@ -5,7 +5,7 @@
 # A client library for interacting with the Fastly web acceleration service
 class Fastly
   # The current version of the library
-  VERSION = "0.95"
+  VERSION = "0.96"
 
   require 'fastly/fetcher'
   require 'fastly/client'
@@ -409,13 +409,14 @@ class Fastly
     return options unless File.exist?(file)
 
     File.open(file, "r") do |infile|
-      while (line = infile.gets.chomp) do
+      while (line = infile.gets) do
+        line.chomp!
         next if     line =~ /^#/;
         next if     line =~ /^\s*$/;
         next unless line =~ /=/;
         line.strip!
         key, val = line.split(/\s*=\s*/, 2)
-        options[key] = val;
+        options[key.to_sym] = val;
       end
     end
     options;
@@ -430,16 +431,16 @@ class Fastly
   # 
   #     --<key>=<value>
   #
-  def self.get_options(files)
+  def self.get_options(*files)
     options = {}
     files.each do |file|
       next unless File.exist?(file)
-      options = load_options(file)
+      options = load_config(file)
       break
     end
 
     while (ARGV.size>0 && ARGV[0] =~ /^-+(\w+)\=(\w+)$/) do
-      options[$1] = $2;
+      options[$1.to_sym] = $2;
       @ARGV.shift;
     end
     raise"Couldn't find options from command line arguments or #{files.join(', ')}" unless options.size>0

data/lib/fastly/belongs_to_service_and_version.rb

@@ -22,7 +22,7 @@ class Fastly
     
     private
     
-    def self.get_path(service, version, name)
+    def self.get_path(service, version, name, options={})
       "/service/#{service}/version/#{version}/#{path}/#{name}"
     end
     

data/lib/fastly/version.rb

@@ -1,7 +1,7 @@
 class Fastly
   # An iteration of your configuration
   class Version < Base
-    attr_accessor :service_id, :number, :name, :active, :locked, :staging, :testing, :deployed, :comment
+    attr_accessor :service_id, :number, :name, :active, :staging, :testing, :deployed, :comment
     
     ## 
     # :attr: service_id
@@ -52,6 +52,15 @@ class Fastly
     #
     # a free form comment field
     
+    # Is this Version locked
+    def locked?
+      return @locked.to_i > 1
+    end
+    
+    # Set whether this Version is locked
+    def locked=(is_locked)
+      @locked = is_locked ? "1" : "0"
+    end
     
     # Get the Service object this Version belongs to
     def service 

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: fastly
 version: !ruby/object:Gem::Version 
-  hash: 181
+  hash: 203
   prerelease: 
   segments: 
   - 0
-  - 95
-  version: "0.95"
+  - 96
+  version: "0.96"
 platform: ruby
 authors: 
 - Fastly Inc
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-19 00:00:00 Z
+date: 2012-01-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json