middleman-rackspace 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d2b3ba6bea685835c35fd38eb6abe198e0d9e96
-  data.tar.gz: 603e40a365c56cd9ea78fdca7dcf2667ba1c4322
+  metadata.gz: df865b2a6e1983e6c2bac0f9a142842d6ae42ded
+  data.tar.gz: 855183429f07852b80185dbe0bef863b76232394
 SHA512:
-  metadata.gz: 5ae9639c5361faac4caa49dd7fd7d701cf9aada4cbf62907f5c618f19788c2910a75f3595b1ccbf0b08b7714c570920918168f4a18c0deecc830fa02a1b6c222
-  data.tar.gz: 1f7acb829b61b80a0ad3ebb4ebe70a87f521169cc10097690b5f1ed8c6b862a1c1d86b285b6dffa91eb82d2f2d5e40c879282829827e83d4f00d3bd7f3bf2084
+  metadata.gz: af6601a6de2cb65e9bd28e9a2f7ed1134a2fee0fad8404d61415d51ef69ca1506ef4e0608d6d75da99cacba57f68df7ad5f6ff9cef80b82deddd41dc04d62cfa
+  data.tar.gz: 8e86e75d70596ae918db635a428d04feaa96ab7b08c13235abab084adb4cb60197e0d6967ebc8af223cb8ab53e99270a45c63ab49759af4cfc85dc8b55996705

data/CHANGELOG.md

@@ -1,9 +1,14 @@
 # Changelog
 
+## 0.3.0 (2015-11-12)
+
+* Add support to checkout git branch before build.
+* Clean up console logging.
+
 ## 0.2.0 (2015-11-10)
 
 * Add support for 'production' and 'staging' containers.
 
 ## 0.1.0 (2015-11-02)
 
-* Initial release
+* Initial release.

data/README.md

@@ -2,7 +2,7 @@
 
 Deploy your [Middleman](https://middlemanapp.com/) site to [Rackspace Cloud Files](http://www.rackspace.com/cloud/files).
 
-# Usage
+## Usage
 
 Add the following to the `Gemfile` for you Middleman project and perform a `bundle install`.
 
@@ -24,7 +24,20 @@ $ 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
+## Git support
+
+To enable git support, set `config.git` to `true` or pass `--git` on the CLI. When enabled, the `middleman rackspace` command will automatically switch to the git branch corresponding to the environment you are deploying.
+
+Default branch mappings:
+
+  * `staging` environment maps to `staging` branch.
+  * `production` environment maps to `master` branch.
+
+Both of these can be changed in the configuration.
+
+The git support will automatically stash any changes you have in your working tree before switching branch. After a successful build and deploy, these changes will be restored.
+
+## Configuration
 
 Activate and configure middleman-rackspace by adding an `activate :rackspace` block to `config.rb`. For example:
 
@@ -36,7 +49,8 @@ activate :rackspace do |config|
   config.rackspace_region     = :syd
   config.container_staging    = 'example-container-staging'
   config.container_production = 'example-container'
-  config.build_before         = true
+  config.git                  = true
+  config.build                = true
 end
 ```
 
@@ -50,25 +64,28 @@ activate :rackspace do |config|
   config.rackspace_api_key    = ENV['RACKSPACE_API_KEY']
   # The Rackspace region to deploy to
   config.rackspace_region     = :dfw
-  # The target container on Rackspace for staging
+  # The target Rackspace container for each environment
   config.container_staging    = nil
-  # The target container on Rackspace for production
   config.container_production = nil
+  # Git branch for each environment
+  config.branch_staging       = 'staging'
+  config.branch_production    = 'master'
+  # Checkout environment branch before the build/deploy step
+  config.git                  = false
+  # Run `middleman build` before the deploy step
+  config.build                = false
   # Root page filename
   config.index_file           = 'index.html'
   # Error page filename prefix, translates to 401.html and 404.html
   config.error_file_prefix    = '.html'
-  # Run `middleman build` before the deploy step
-  config.build_before         = false
 end
 ```
 
 For a list of available regions see [http://www.rackspace.com/knowledge_center/article/about-regions](http://www.rackspace.com/knowledge_center/article/about-regions).
 
-# Todo
+## Todo
 
 * 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_ENVIRONMENT_TIMESTAMP.tar.gz`.
 * Improve error handling.

data/lib/middleman-rackspace/cli.rb

@@ -11,10 +11,14 @@ module Middleman
 
       desc 'rackspace ENVIRONMENT [options]', 'Deploy to Rackspace container for ENVIRONMENT'
 
-      class_option :build_before,
+      class_option :git,
+                   aliases: '-g',
+                   type: :boolean,
+                   desc: 'Checkout environment branch before the build/deploy step'
+
+      class_option :build,
                    aliases: '-b',
                    type: :boolean,
-                   #default: false,
                    desc: 'Run `middleman build` before the deploy step'
 
       # Tell Thor to exit with a non-zero exit code on failure
@@ -30,14 +34,72 @@ module Middleman
         # Instantiate Middleman and load config
         app = Middleman::Application.server.inst
 
-        # Run `middleman build` if specified with '-b' or in 'config.rb'
-        build_enabled = options[:build_before] || app.extensions[:rackspace].options.build_before
-        if build_enabled
+        # Pull the Rackspace config out of 'app'
+        config = app.extensions[:rackspace].options
+
+        # Use git if specified with '--git' or in 'config.rb'
+        git_enabled = options[:git] || config.git
+        original_branch = ''
+        switching = false
+        stash = ''
+        if git_enabled
+          original_branch = `git rev-parse --abbrev-ref HEAD`.chomp
+          branch = case environment
+                   when 'staging'
+                     config.branch_staging
+                   when 'production'
+                     config.branch_production
+                   end
+          switching = original_branch != branch
+
+          stash = `git stash create`
+          unless stash.empty?
+            puts ''
+            puts 'Working changes have been stashed. On failure, manually restore with:'
+            puts ''
+            puts "    git stash apply #{stash}"
+          end
+
+          # Switch branch if needed and have a clean working tree
+          if switching
+            puts ''
+            puts "Checking out '#{branch}' branch."
+            run("git checkout #{branch} --force") || exit(1)
+          elsif !stash.empty?
+            puts ''
+            puts 'Cleaning working tree.'
+            run('git reset --hard') || exit(1)
+          end
+
+          # Do a 'git pull' to update the branch from the remote
+          puts ''
+          puts 'Updating branch from remote.'
+          run('git pull') || exit(1)
+        end
+
+        # Run `middleman build` if specified with '--build' or in 'config.rb'
+        if options[:build] || config.build
+          puts ''
+          puts 'Building site.'
           run('middleman build') || exit(1)
         end
 
         # Deploy the built website
         Middleman::Rackspace.deploy(app, environment)
+
+        # Change back to original branch and restore any saved stash
+        if git_enabled
+          if switching
+            puts ''
+            puts "Switching back to '#{original_branch}' branch."
+            run("git checkout #{original_branch}") || exit(1)
+          end
+          unless stash.empty?
+            puts ''
+            puts "Restoring working changes."
+            run("git stash apply #{stash}") || exit(1)
+          end
+        end
       end
     end
   end

data/lib/middleman-rackspace/deploy.rb

@@ -15,11 +15,10 @@ module Middleman
                          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}"
+      puts ''
+      puts "Creating archive '#{archive_name}'."
 
       # Compress /build directory into build_ENVIRONMENT_TIMESTAMP.tar.gz
       system("cd ./build && tar -zcvf ../#{archive_name} .")
@@ -36,7 +35,8 @@ module Middleman
       # Get or create container
       root_directory = service.directories.get(container_name)
       unless root_directory
-        puts "Creating container: #{container_name}"
+        puts ''
+        puts "Creating container '#{container_name}'."
         # Create the new container
         root_directory = service.directories.create(key: container_name, public: true)
         # Configure container for static site hosting
@@ -47,13 +47,15 @@ module Middleman
                                 'X-Container-Meta-Web-Error' => config.error_file_prefix})
       end
 
-      puts "Updating container: #{root_directory.key}"
+      puts ''
+      puts "Updating container '#{container_name}'."
 
       # Upload and extract tar.gz on Rackspace
       # https://developer.rackspace.com/docs/cloud-files/v1/developer-guide/#extracting-archive-files
       service.extract_archive(container_name, File.open(archive_name, 'r'), 'tar.gz')
 
-      puts "Website live at: #{root_directory.public_url}"
+      puts ''
+      puts "Container '#{container_name}' live at:\n#{root_directory.public_url}"
     end
   end
 end

data/lib/middleman-rackspace/extension.rb

@@ -6,11 +6,14 @@ 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_staging, nil, 'The target container on Rackspace for staging'
-      option :container_production, nil, 'The target container on Rackspace for production'
+      option :container_staging, nil, 'The target Rackspace container for staging'
+      option :container_production, nil, 'The target Rackspace container for production'
+      option :branch_staging, 'staging', 'Git branch for staging'
+      option :branch_production, 'master', 'Git branch for production'
+      option :git, false, 'Checkout environment branch before the build/deploy step'
+      option :build, false, 'Run `middleman build` before the deploy step'
       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'
 
       def initialize(app, options_hash={}, &block)
         super

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

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

data/middleman-rackspace.gemspec

@@ -6,7 +6,7 @@ require 'middleman-rackspace/pkg-info'
 Gem::Specification.new do |s|
   s.name        = Middleman::Rackspace::PACKAGE
   s.version     = Middleman::Rackspace::VERSION
-  s.authors     = ['David Cristofaro']
+  s.author      = 'David Cristofaro'
   s.homepage    = 'https://github.com/dtcristo/middleman-rackspace'
   s.summary     = Middleman::Rackspace::TAGLINE
   s.license     = 'MIT'
@@ -16,6 +16,8 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_path  = 'lib'
 
+  s.required_ruby_version = '>= 2.0'
+
   s.add_runtime_dependency 'middleman-core', '~> 3.4'
   s.add_runtime_dependency 'fog', '~> 1.35'
   s.add_runtime_dependency 'typhoeus', '~> 0.8'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: middleman-rackspace
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - David Cristofaro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-10 00:00:00.000000000 Z
+date: 2015-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
@@ -84,7 +84,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="