middleman-fjords 1.0.3 → 1.1.0

data/Gemfile

@@ -1,4 +1,4 @@
-source :rubygems
+source 'https://rubygems.org'
 
 git "git://github.com/middleman/middleman.git", :branch => "3.0-stable" do
   # gem "middleman"

data/LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2013 Thomas Reynolds
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/middleman-fjords/commands/fjords.rb

@@ -39,9 +39,9 @@ module Middleman
         # puts "Deploying..."
         cmd = "bundle exec fjords push"
         cmd << %Q{ --path="#{shared_instance.build_dir}" --no-progress}
-        if opts.no_zip
-          cmd << %Q{ --no-zip}
-        end
+        # if opts.no_zip
+        #   cmd << %Q{ --no-zip}
+        # end
         if opts.domain
           cmd << %Q{ --domain="#{opts.domain}"}
           cmd << %Q{ --overwrite}
@@ -60,6 +60,37 @@ module Middleman
           # puts "The child process exited!"
         end
 
+        if opts.gzip_assets
+          if !::Fjords::Client.has_gzip(opts.domain)
+            ::Fjords::Client.enable_gzip(opts.domain)
+            puts "Enabled Gzip"
+          end
+        else
+          if ::Fjords::Client.has_gzip(opts.domain)
+            ::Fjords::Client.disable_gzip(opts.domain)
+            puts "Disabled Gzip"
+          end
+        end
+
+        if opts.cdn
+          if !::Fjords::Client.has_cdn(opts.domain)
+            site = ::Fjords::Client.enable_cdn(opts.domain)
+
+            puts %Q{Enabled CDN for "#{domain}".}
+            puts "Deploying your files around the planet takes some time."
+            puts "Please be patient."
+            puts
+
+            puts "In the meantime,"
+            puts "Make sure your CNAME points to: #{site["cdn_internal_name"]}"
+          end
+        else
+          if ::Fjords::Client.has_cdn(opts.domain)
+            ::Fjords::Client.disable_cdn(opts.domain)
+            puts "Disabled CDN"
+          end
+        end
+
       end
     end
   end

data/lib/middleman-fjords/extension.rb

@@ -6,7 +6,9 @@ module Middleman::Fjords
             :domain,
             :domain_file,
             :rebuild,
-            :no_zip,
+            # :no_zip,
+            :gzip_assets,
+            :cdn,
             :username,
             :password
            ]
@@ -33,7 +35,9 @@ module Middleman::Fjords
       options.rebuild      ||= false
       options.domain       ||= nil
       options.domain_file  ||= nil
-      options.no_zip       ||= false
+      # options.no_zip       ||= false
+      options.gzip_assets  ||= false
+      options.cdn          ||= false
       
       app.set :fjords_options, options
     end

data/lib/middleman-fjords/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module Fjords
-    VERSION = "1.0.3"
+    VERSION = "1.1.0"
   end
 end

data/middleman-fjords.gemspec

@@ -19,5 +19,5 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   
   s.add_dependency("middleman-core", [">= 3.0.1"])
-  s.add_dependency("fjords", "1.0.3")
+  s.add_dependency("fjords", "1.1.0")
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-fjords
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-11 00:00:00.000000000 Z
+date: 2013-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.1.0
 description: Push-button deploy
 email:
 - me@tdreyno.com
@@ -52,6 +52,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
+- LICENSE
 - Rakefile
 - features/support/env.rb
 - fixtures/blog-app/build/2010/12/13/old-article.html
@@ -82,7 +83,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3517759750267830978
+      hash: 2312255224962470377
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -91,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3517759750267830978
+      hash: 2312255224962470377
 requirements: []
 rubyforge_project: middleman-fjords
 rubygems_version: 1.8.23