update microstatic

TestingWithFrank · Aug 2, 2013 · 68fec6c · 68fec6c
1 parent 8f55565
commit 68fec6c
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 11 deletions.
diff --git a/Gemfile b/Gemfile
@@ -3,4 +3,4 @@ gem "RedCloth"
 gem "rake"
 gem "jekyll", "0.11.0"
 gem "liquid", "~>2.2.2"
-gem "microstatic", "~> 0.2.0"
+gem "microstatic", "~> 0.3.0"
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -4,15 +4,23 @@ GEM
     RedCloth (4.2.9)
     albino (1.3.3)
       posix-spawn (>= 0.3.6)
-    aws-s3 (0.6.3)
-      builder
-      mime-types
-      xml-simple
     builder (3.2.0)
     classifier (1.3.3)
       fast-stemmer (>= 1.0.0)
     directory_watcher (1.4.1)
+    excon (0.25.3)
     fast-stemmer (1.0.1)
+    fog (1.14.0)
+      builder
+      excon (~> 0.25.0)
+      formatador (~> 0.2.0)
+      mime-types
+      multi_json (~> 1.0)
+      net-scp (~> 1.1)
+      net-ssh (>= 2.1.3)
+      nokogiri (~> 1.5)
+      ruby-hmac
+    formatador (0.2.4)
     jekyll (0.11.0)
       albino (>= 1.3.2)
       classifier (>= 1.3.1)
@@ -24,13 +32,20 @@ GEM
     liquid (2.2.2)
     maruku (0.6.0)
       syntax (>= 1.0.0)
-    microstatic (0.2.0)
-      aws-s3 (~> 0.6.3)
+    microstatic (0.3.0)
+      fog (>= 1)
     mime-types (1.23)
+    mini_portile (0.5.1)
+    multi_json (1.7.7)
+    net-scp (1.1.2)
+      net-ssh (>= 2.6.5)
+    net-ssh (2.6.8)
+    nokogiri (1.6.0)
+      mini_portile (~> 0.5.0)
     posix-spawn (0.3.6)
     rake (10.0.4)
+    ruby-hmac (0.4.0)
     syntax (1.0.0)
-    xml-simple (1.1.2)
 
 PLATFORMS
   ruby
@@ -39,5 +54,5 @@ DEPENDENCIES
   RedCloth
   jekyll (= 0.11.0)
   liquid (~> 2.2.2)
-  microstatic (~> 0.2.0)
+  microstatic (~> 0.3.0)
   rake
diff --git a/Rakefile b/Rakefile
@@ -1,4 +1,3 @@
-require 'aws/s3'
 require_relative 'tasks/deploy_tasks.rb'
 
 

diff --git a/tasks/deploy_tasks.rb b/tasks/deploy_tasks.rb
@@ -1,7 +1,7 @@
 require 'microstatic/rake'
 
 PREVIEW_AWS_BUCKET = "preview.testingwithfrank.com"
-PRODUCTION_AWS_BUCKET = "preview.testingwithfrank.com" # NOT CONFIDENT QUITE YET
+PRODUCTION_AWS_BUCKET = "www.testingwithfrank.com"
 
 def aws_creds
   {
Original file line number	Diff line number	Diff line change
		@@ -1,4 +1,3 @@
		require 'aws/s3'
		require_relative 'tasks/deploy_tasks.rb'


Expand Down