bog 0.0.6 → 0.1.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MjVhMjNmYmE1NGMyZTg1ZWEwODllZDNkZmZkM2IyZDM4ZmYxZjg3YQ==
-  data.tar.gz: !binary |-
-    OTZiYjUxM2ExZDMzYWQxODVjOGM3OTU5YTg0M2NlNDdjOWMwZjE5NQ==
+SHA1:
+  metadata.gz: b3be958e003d41498558912eb307039001493d8f
+  data.tar.gz: f7f58634bb19e8a07c481bcae18b1b2135c6f71d
 SHA512:
-  metadata.gz: !binary |-
-    Mjc2Mzc1MjM4ZDI3NjNkMDc4MWYxNzg0M2MxYmQ2NmU2ODc0OWQzZjZhODhh
-    NjEwZjY5OTJkYmI2MWY2MzI4YjExMzhiYTdlZmU3M2QyMjJhMmJiYzJkNDNj
-    OTY0MGJkMDMzZTI4NmZmNGVkYjZlZTA4YzMzNmZiYzhlN2FhODY=
-  data.tar.gz: !binary |-
-    YzcxZDdlNmJmNzAzNDRiMDc2Y2I4MTNjOTc5NmRiYmEzZmU5NDViMWNiYzJl
-    MGZmYjU2NzM4ODEzYzBiZmUwZDQxNWNiMzlhNjZiMmRhYzhlOWQ2N2FhMDBk
-    MzQ4ZWI2MjJmZjM0MDYyOTQ4NjY2YzhmZmM1ZDcyNzdlOTc2MTg=
+  metadata.gz: 9c8b0e7619edd96048d1a5a2ac9d47912c5ea1a855cb6cd0fa2421d2feaafc56f114e770b7f13432b173414a7b9681ba9b94f18e324057b353e03bda8b7c8a4b
+  data.tar.gz: 13cc1d0a55f741f3fbe4dce271cac99e88e002be9ba009f37855d4ad3f0a0d1d66ae89b791b3e58f5f762af1ccd05ab14e244f64fe5d2ec416c0ea19f6605323

data/.travis.yml

@@ -1,4 +1,5 @@
 language: ruby
+cache: bundler
 rvm:
 - 1.9.3
 - 2.0.0

data/README.md

@@ -12,8 +12,10 @@ You may have multiple clients, or may split your environments between EC2 accoun
 work with collections of dotfile configurations and to swap between those sets.
 
 ## Example
+The traditional form, where you manually switch profiles:
+
 ```bash
-$ bog myclient init --aws --chef	# Configure ~/.bog with stubs for AWS and Chef under profile 'myclient'
+$ bog myclient init --aws 	# Configure ~/.bog with a stub for AWS under profile 'myclient'
 Enter your Amazon Secrect Access Key:
 ...
 $ bog myclient					# Switch to profile 'myclient'
@@ -22,17 +24,34 @@ $ aws s3 ls
 ...
 $ bog personal					# Switch to another profile
 ...
+$ bog                   # Show the current profile
+personal
+```
+With roaming profiles enabled:
+```bash
+$ bog personal default  # Set default profile
+$ source ~/.bog/bog.sh  # Source shell helpers
+$ cd ~/src/project
+$ echo "myclient" > .bog-profile
+$ bog                   # Profile set by dotfile
+myclient
+$ cd ..
+$ bog                   # Profile set from default
+personal                # without dotfile present
+$ bog someprofile
+$ bog                   # Setting profile ignored
+personal                # with roaming profiles
 ```
 
 ### One-off commands 
 ```bash
-$ bog myclient exec aws s3 ls			# Exec command as myclient, then
-$ bog myclient exec knife client list		# switch back to previous profile 
+$ bog myclient exec aws s3 ls          # Exec command as myclient, then
+$ bog myclient exec knife client list  # switch back to previous profile 
 ...
 ```
 
 ## How it works
-`bog init myclient --aws --chef` will create 
+`bog init myclient --aws` will create 
 
 ```
 .bog
@@ -40,14 +59,24 @@ $ bog myclient exec knife client list		# switch back to previous profile
 ├── plugins
 └── profiles
     └── myclient
-        ├── .aws
-        └── .chef
+        └── .aws
 ```
 If you passed a switch such as `--aws` then the correctly named configuration files will be present and populated. Otherwise you
 are free to include whatever you choose.
 
 `bog` will never touch your `~/.aws` and similar directories. You will need to symlink these to `~/.bog/current/.aws` (as appropriate) in order to have bog work.
 
+### Roaming profiles
+By sourcing `~/.bog/bog.sh` into your shell environment and placing a file called `.bog-profile` into one or more directories you can take advantage of roaming profiles. In short, when `bog` detects such a file it'll automatically change your current profile to that given in the dotfile. This enables you to easily work with per-project profiles, for example.
+
+It does this by recursing up from the current directory until it either finds a `.bog-profile` file or fails and continues with the **default profile**. You should be aware of the implications therefore of nested directories and of the implications for concurrency when running commands under `bog` in multiple terminals.
+
+It also expects you to have a default profile configured for when a dotfile cannot be found. You can do this by executing `bog PROFILE default`.
+
+**Be aware that using roaming profiles is mutally exclusive to using `bog PROFILE` to set your profile. IT WILL BE IGNORED. Your current profile will be determined either from the presence of a dotfile or from your default.**
+
+You should be sure to source `~/.bog/bog.sh` **after** anything else that might hook into `$PROMPT_COMMAND`, such as chruby, rvm, or liquidprompt.
+
 ## Why another dotfile manager
 There are plenty out there. `bog` aims to fit a modern operational workflow and toolset.
 

data/bin/bog

@@ -2,8 +2,10 @@
 
 require 'bog'
 require 'slop'
+require 'require_all'
+require_rel '../lib/bog/command'
 
-profile = ARGV[0].downcase
+profile = ARGV[0].downcase if ARGV[0]
 command = ARGV[1].downcase if ARGV[1]
 
 unless command == 'exec' 
@@ -11,7 +13,6 @@ unless command == 'exec'
     banner 'Usage: bog PROFILE [COMMAND] [options]'
     on 'h', 'help', 'Display this message'
     on 'a', 'aws', 'When passed to the \'init\' subcommand, prompt for AWS credentials'
-    on 'c', 'chef', 'When passed to the \'init\' subcommand, prompt for Chef credentials'
   end
 
   if @options.help?
@@ -22,6 +23,12 @@ else
   @options = { :commands => ARGV[2..-1].join(' ') }
 end
 
+# With no arguments show the current profile name
+unless profile
+  Bog::Command::Show.execute
+  exit 0
+end
+
 if command
   case command
   when 'init'

data/bog.gemspec

@@ -23,4 +23,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec", "~> 3.0"
 
   spec.add_dependency "slop", "~> 3.4"
+  spec.add_dependency "require_all", "~> 1.3"
 end

data/lib/bog/command/default.rb

@@ -0,0 +1,15 @@
+require 'bog/profile'
+
+module Bog
+  class Command
+    class Default
+      def self.execute(profile,options={})
+        old_profile = Bog::Profile.current
+        Bog::Profile.switch_to(profile.profile_name)
+        Bog::Profile.current.make_default
+        Bog::Profile.switch_to(old_profile.profile_name)
+      end
+
+    end
+  end
+end

data/lib/bog/command/exec.rb

@@ -1,17 +1,13 @@
+require 'bog/profile'
+
 module Bog
   class Command
     class Exec 
       def self.execute(profile, options)
-	old_profile = get_current_profile
- 	Bog::Profile.switch_to(profile.profile_name)
-	system("#{options[:commands]} 2>&1")
-	Bog::Profile.switch_to(old_profile.profile_name)
-      end
-
-      private
-      
-      def self.get_current_profile
-        Bog::Profile.find(File.basename(File.readlink(File.expand_path('~/.bog/current'))))
+        old_profile = Bog::Profile.current
+        Bog::Profile.switch_to(profile.profile_name)
+        system("#{options[:commands]} 2>&1")
+        Bog::Profile.switch_to(old_profile.profile_name)
       end
 
     end

data/lib/bog/command/init.rb

@@ -1,4 +1,5 @@
 require 'bog/initializer'
+require 'fileutils'
 
 module Bog
   class Command
@@ -10,7 +11,6 @@ module Bog
         Dir.mkdir(profile_path) unless File.directory?(profile_path)
 
         Bog::Initializer::AWS.new(Bog::Profile.find(profile), options) if options.aws?
-        Bog::Initializer::Chef.new(Bog::Profile.find(profile), options) if options.chef?
 
       end
 
@@ -21,6 +21,11 @@ module Bog
         profiles = File.join(bog_root, 'profiles')
         Dir.mkdir(bog_root) unless File.exists?(bog_root)
         Dir.mkdir(profiles) unless File.exists?(profiles)
+        
+        # Drop the shell helpers in
+        spec = Gem::Specification.find_by_name("bog")
+        gem_root = spec.gem_dir
+        FileUtils.copy_file(File.join(gem_root, 'libexec/bog.sh'), File.join(bog_root, 'bog.sh'))
       end
     end
   end

data/lib/bog/command/show.rb

@@ -0,0 +1,12 @@
+require 'bog/profile'
+
+module Bog
+  class Command
+    class Show
+      def self.execute
+        puts Bog::Profile.current.profile_name
+      end
+
+    end
+  end
+end

data/lib/bog/initializer.rb

@@ -1,5 +1,4 @@
 require 'bog/initializer/aws'
-require 'bog/initializer/chef'
 
 module Bog
   class Initializer

data/lib/bog/profile.rb

@@ -23,7 +23,7 @@ module Bog
       if Dir.entries(File.expand_path('~/.bog/profiles')).include?(profile.to_s)
         return Bog::Profile.load(profile)
       else
-	raise Bog::Profile::Exception::ProfileNotFound
+	      raise Bog::Profile::Exception::ProfileNotFound
       end
     end
 
@@ -37,6 +37,15 @@ module Bog
       symlink(profile_root, current_status_file,)
     end
 
+    def make_default
+      puts "Making #{self.profile_name} default profile"
+      File.write(File.expand_path('~/.bog/default'), self.profile_name)
+    end
+
+    def self.current
+      Bog::Profile.find(File.basename(File.readlink(File.expand_path('~/.bog/current'))))
+    end
+
     private
 
     def profile_root

data/lib/bog/version.rb

@@ -1,3 +1,3 @@
 module Bog
-  VERSION = "0.0.6"
+  VERSION = "0.1.0"
 end

data/libexec/bog.sh

@@ -0,0 +1,29 @@
+#!/bin/bash
+function _set_bog_profile {
+  local stop_flag=''
+  local current_directory=${PWD}
+  while [[ ${current_directory} != '/' ]] && [[ -z ${stop_flag} ]]; do
+
+    if [[ -e "${current_directory}/.bog-profile" ]]; then
+      bog $(cat "${current_directory}/.bog-profile")
+      stop_flag='.'
+    fi
+
+    current_directory=$(dirname ${current_directory})
+  done
+
+  # If we've never found a dotfile use the default
+  if [[ -z ${stop_flag} ]]; then
+    if [[ -e ~/.bog/default ]]; then
+      bog $(cat ~/.bog/default)
+    else
+      echo 'bog cannot find a default profile.'
+      echo 'You may set one with `bog PROFILE default`.'
+      echo 'If you choose not to do this your current'
+      echo 'profile will be set by the last .bog-profile.'
+    fi
+  fi
+}
+
+old_prompt_command=${PROMPT_COMMAND}
+export PROMPT_COMMAND="_set_bog_profile; ${old_prompt_command}"

metadata

@@ -1,71 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: bog
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.1.0
 platform: ruby
 authors:
 - sam
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-12 00:00:00.000000000 Z
+date: 2015-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: slop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
+- !ruby/object:Gem::Dependency
+  name: require_all
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
 description: A tool for managing cloud API and configuration management credentials.
   rbenv for dotfiles.
 email:
@@ -75,9 +89,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -86,14 +100,16 @@ files:
 - bog.gemspec
 - lib/bog.rb
 - lib/bog/command.rb
+- lib/bog/command/default.rb
 - lib/bog/command/exec.rb
 - lib/bog/command/init.rb
+- lib/bog/command/show.rb
 - lib/bog/initializer.rb
 - lib/bog/initializer/aws.rb
-- lib/bog/initializer/chef.rb
 - lib/bog/profile.rb
 - lib/bog/profile/exception.rb
 - lib/bog/version.rb
+- libexec/bog.sh
 - spec/bog_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/opsunit/bog
@@ -106,17 +122,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A tool for managing cloud API and configuration management credentials.

data/lib/bog/initializer/chef.rb

@@ -1,8 +0,0 @@
-module Bog
-  class Initializer
-    class Chef < Initializer
-      def initialize(profile, options)
-      end
-    end
-  end
-end