middleman-rackspace 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f57344325ea2d681868c5cc1fbcb7e292507a2c8
-  data.tar.gz: 226e861fdfe46ebacc13206789a37529a6103a6c
+  metadata.gz: 9d2b3ba6bea685835c35fd38eb6abe198e0d9e96
+  data.tar.gz: 603e40a365c56cd9ea78fdca7dcf2667ba1c4322
 SHA512:
-  metadata.gz: d14cb7e8a21197b4be875ccd135c3ccf0757e503942ef6eeba854feca493f271079f6a611c72da9a943a6bb428c17a8a3955f75d8ca605c56487f0b290dcb6d4
-  data.tar.gz: b9b8a4db17f8bc1123439b92665c911bd34f2b99c4be025da43b3e940149b50d47f2d93076b2601d292367987413f420f53072950dda23cedfd60cdcd6d1a149
+  metadata.gz: 5ae9639c5361faac4caa49dd7fd7d701cf9aada4cbf62907f5c618f19788c2910a75f3595b1ccbf0b08b7714c570920918168f4a18c0deecc830fa02a1b6c222
+  data.tar.gz: 1f7acb829b61b80a0ad3ebb4ebe70a87f521169cc10097690b5f1ed8c6b862a1c1d86b285b6dffa91eb82d2f2d5e40c879282829827e83d4f00d3bd7f3bf2084

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.2.0 (2015-11-10)
+
+* Add support for 'production' and 'staging' containers.
+
 ## 0.1.0 (2015-11-02)
 
 * Initial release

data/README.md

@@ -10,13 +10,19 @@ Add the following to the `Gemfile` for you Middleman project and perform a `bund
 gem 'middleman-rackspace'
 ```
 
-After configuration, you can deploy to the configured region and container with:
+After configuration, you can deploy to the production container with:
 
 ```
-$ middleman rackspace
+$ middleman rackspace production
 ```
 
-An archive `build_TIMESTAMP.tar.gz` is created for your current build and pushed to Rackspace. A new container will automatically be configured if needed. If there is an existing container with the same name, **data will be overwritten**.
+To deploy to the staging container, use:
+
+```
+$ middleman rackspace staging
+```
+
+An archive `build_ENVIRONMENT_TIMESTAMP.tar.gz` is created for your current build and pushed to Rackspace. A new container will automatically be configured on the specified region. If there is an existing container with the same name, **data will be overwritten**.
 
 # Configuration
 
@@ -25,11 +31,12 @@ Activate and configure middleman-rackspace by adding an `activate :rackspace` bl
 ```ruby
 # Example configuration
 activate :rackspace do |config|
-  config.rackspace_username = 'username'
-  config.rackspace_api_key  = 'a99c75008c3f4ccd31ce67a0674db356'
-  config.rackspace_region   = :syd
-  config.container_name     = 'example-site'
-  config.build_before       = true
+  config.rackspace_username   = 'username'
+  config.rackspace_api_key    = 'a99c75008c3f4ccd31ce67a0674db356'
+  config.rackspace_region     = :syd
+  config.container_staging    = 'example-container-staging'
+  config.container_production = 'example-container'
+  config.build_before         = true
 end
 ```
 
@@ -39,18 +46,20 @@ Here is a list of all configuration options available with their default values.
 # Default configuration
 activate :rackspace do |config|
   # Rackspace credentials
-  config.rackspace_username = ENV['RACKSPACE_USERNAME']
-  config.rackspace_api_key  = ENV['RACKSPACE_API_KEY']
+  config.rackspace_username   = ENV['RACKSPACE_USERNAME']
+  config.rackspace_api_key    = ENV['RACKSPACE_API_KEY']
   # The Rackspace region to deploy to
-  config.rackspace_region   = :dfw
-  # The target container on Rackspace
-  config.container_name     = nil
+  config.rackspace_region     = :dfw
+  # The target container on Rackspace for staging
+  config.container_staging    = nil
+  # The target container on Rackspace for production
+  config.container_production = nil
   # Root page filename
-  config.index_file         = 'index.html'
+  config.index_file           = 'index.html'
   # Error page filename prefix, translates to 401.html and 404.html
-  config.error_file_prefix  = '.html'
+  config.error_file_prefix    = '.html'
   # Run `middleman build` before the deploy step
-  config.build_before       = false
+  config.build_before         = false
 end
 ```
 
@@ -61,5 +70,5 @@ For a list of available regions see [http://www.rackspace.com/knowledge_center/a
 * On deploy, delete files on the server that have been removed from the build.
 * Invalidate cache after deploy.
 * Integrate with git to deploy from a branch.
-* Improve CLI to deploy from a pre-built `build_TIMESTAMP.tar.gz`.
+* Improve CLI to deploy from a pre-built `build_ENVIRONMENT_TIMESTAMP.tar.gz`.
 * Improve error handling.

data/lib/middleman-rackspace/cli.rb

@@ -2,13 +2,15 @@ require 'middleman-core/cli'
 
 module Middleman
   module Cli
-    class Rackspace < Thor::Group
+    class Rackspace < Thor
       include Thor::Actions
 
       check_unknown_options!
 
       namespace :rackspace
 
+      desc 'rackspace ENVIRONMENT [options]', 'Deploy to Rackspace container for ENVIRONMENT'
+
       class_option :build_before,
                    aliases: '-b',
                    type: :boolean,
@@ -20,7 +22,11 @@ module Middleman
         true
       end
 
-      def rackspace
+      def rackspace(environment)
+        unless environment == 'staging' || environment == 'production'
+          raise Thor::Error, "Unknown environment '#{environment}'. Use 'staging' or 'production'."
+        end
+
         # Instantiate Middleman and load config
         app = Middleman::Application.server.inst
 
@@ -31,11 +37,8 @@ module Middleman
         end
 
         # Deploy the built website
-        Middleman::Rackspace.deploy(app)
+        Middleman::Rackspace.deploy(app, environment)
       end
     end
-
-    # Register 'rackspace' as a Middleman CLI extention
-    Base.register(Middleman::Cli::Rackspace, 'rackspace', 'rackspace [options]', Middleman::Rackspace::TAGLINE)
   end
 end

data/lib/middleman-rackspace/deploy.rb

@@ -5,15 +5,23 @@ module Middleman
   module Rackspace
     module_function
 
-    def deploy(app)
+    def deploy(app, environment)
       config = app.extensions[:rackspace].options
-      container_name = config.container_name
 
-      # build_TIMESTAMP.tar.gz
-      archive_name = "build_#{Time.now.strftime('%Y-%m-%d_%H-%M-%S')}.tar.gz"
+      container_name = case environment
+                       when 'staging'
+                         config.container_staging
+                       when 'production'
+                         config.container_production
+                       end
+
+      puts "Deploying for #{environment} to '#{container_name}'"
+
+      # build_ENVIRONMENT_TIMESTAMP.tar.gz
+      archive_name = "build_#{environment}_#{Time.now.strftime('%Y-%m-%d_%H-%M-%S')}.tar.gz"
       puts "Creating archive: #{archive_name}"
 
-      # Compress /build directory into build_TIMESTAMP.tar.gz
+      # Compress /build directory into build_ENVIRONMENT_TIMESTAMP.tar.gz
       system("cd ./build && tar -zcvf ../#{archive_name} .")
 
       # Configure Fog

data/lib/middleman-rackspace/extension.rb

@@ -6,7 +6,8 @@ module Middleman
       option :rackspace_username, ENV['RACKSPACE_USERNAME'], 'Rackspace username'
       option :rackspace_api_key, ENV['RACKSPACE_API_KEY'], 'Rackspace API key'
       option :rackspace_region, :dfw, 'Rackspace region'
-      option :container_name, nil, 'The target container on Rackspace'
+      option :container_staging, nil, 'The target container on Rackspace for staging'
+      option :container_production, nil, 'The target container on Rackspace for production'
       option :index_file, 'index.html', 'Index filename configuration'
       option :error_file_prefix, '.html', 'Error filename configuration'
       option :build_before, false, 'Run `middleman build` before the deploy step'

data/lib/middleman-rackspace/pkg-info.rb

@@ -1,7 +1,7 @@
 module Middleman
   module Rackspace
     PACKAGE = 'middleman-rackspace'
-    VERSION = '0.1.0'
+    VERSION = '0.2.0'
     TAGLINE = 'Deploy your Middleman site to Rackspace Cloud Files'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: middleman-rackspace
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - David Cristofaro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-02 00:00:00.000000000 Z
+date: 2015-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core