orats 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4074c37de6ccbdfd2b84f5ef94d306e0ae09a38c
-  data.tar.gz: 84e6cf532395d751261e71b6145b2808b3643e85
+  metadata.gz: 66f5f6015804945e89a0b85282a9a509a9651b1e
+  data.tar.gz: fa9b364b8cfaa9065fd9379b4f75dff5244199ec
 SHA512:
-  metadata.gz: 9210ea048f5c610c5c5b291715f3b6204eeea37e25f066d6334282ce7a9170d521272a6bb8ba0f361f9b60f22e8cd54da13fb02d1b0c90c2397258ce399e2506
-  data.tar.gz: 85c99459d792ddf47ca77046c28c45bf95cbfce3459afc205017622b4793c3f409c514159c124b1f33105d053b6f9d6206e6fe3d3495f7c9a020778f4964cc3d
+  metadata.gz: 0bfa04d6b0599aca03c1a975c703d977a74b013879fad65d4cacb62b7196309bb85130110a651bb919253066740c9e5fc357dbd500f9d453effb2e6c8eb1a1d2
+  data.tar.gz: 82a0cc18403d621958a1b52ce46d26e1703b3e814e2badd8e62b3e86ccc5ba140e5947071de83584de4e37ae3a1bf6be24ae82e224e7869968cf4291141388c0

data/README.md

@@ -5,7 +5,7 @@ This readme file is based off the master version of orats. If you want accurate
 
 ## What is orats and what problem does it solve?
 
-It stands for opinionated rails application templates. The templates include solving tedious tasks that you would do for most projects. It handles creating a rails application with a bunch of opinions and optionally an ansible inventory/playbook so you can and provision your servers and deploy your apps effortlessly.
+It stands for opinionated rails application templates. The templates include solving tedious tasks that you would do for most projects. It handles creating a rails application with a bunch of opinions and optionally an ansible inventory/playbook so you can provision your servers and deploy your apps effortlessly.
 
 ## What version of Rails and Ruby are you targeting?
 
@@ -20,11 +20,11 @@ Gems will also be updated once they are proven to work on the target rails/ruby
     - [Project](#project)
     - [Inventory](#inventory)
         - [Try it](#try-the-inventory-command)
-        - [FAQ](#inventory-faq)
-            - [What's with the sudo password](#whats-with-the-sudo-password)
     - [Playbook](#playbook)
         - [Try it](#try-the-playbook-command)
         - [Ansible roles](#ansible-roles-used)
+        - [FAQ](#playbook-faq)
+            - [What is the Galaxyfile?](#what-is-the-galaxyfile)
     - [Diff](#diff)
         - [Try it](#try-the-diff-command)
     - [Templates](#templates)
@@ -96,15 +96,9 @@ Here is an overview of the available commands. You can find out more information
     - Project:
         - Optionally takes: `--skip-ansible [false]`
         - Optionally takes: `--skip-server-start [false]`
-    - Ansible:
-        - Optionally takes: `--sudo-password []`
-        - Optionally takes: `--skip-galaxy [false]`
 
 - **Create an ansible inventory**:
     - `orats inventory <TARGET_PATH>`
-    - Configuration:
-        - Optionally takes: `--sudo-password []`
-        - Optionally takes: `--skip-galaxy [false]`
 
 - **Create an ansible playbook**:
     - `orats playbook <TARGET_PATH>`
@@ -115,11 +109,13 @@ Here is an overview of the available commands. You can find out more information
     - `orats nuke <TARGET_PATH>`
     - Optionally takes: `--skip-data [false]`
 
-- **Compare differences between orats versions**:
+- **Compare differences between your orats files and the latest version's 
+files**:
     - `orats diff [options]`
+    - Optionally takes: `--galaxyfile []`
+    - Optionally takes: `--playbook []`
     - Optionally takes: `--hosts []`
     - Optionally takes: `--inventory []`
-    - Optionally takes: `--playbook []`
 
 - **Get a list of available orats templates**:
     - `orats templates`
@@ -167,31 +163,11 @@ You may also consider using this command if you happen to use ansible but are
         - This could be used to send to your servers
     - Create self signed ssl certificates to test/support ssl
     - Create a monit pem file for its optional http interface over ssl
-- Galaxy install the roles required by an orats project
-    - Optionally turned off with `--skip-galaxy`
 
 #### Try the inventory command
 
 `orats inventory myinventory`
 
-#### Inventory FAQ
-
-##### What's with the sudo password flag?
-
-Ansible can be installed in a number of ways. A common way is to build a  package or use a package manager. When you install ansible this way it
- gets installed to `/etc/ansible`.
- 
- By default ansible will download roles from the galaxy to 
- `/etc/ansible/roles` which will require sudo to write to.
- 
- If you installed ansible to your home directory then orats is smart enough 
- not to use sudo. It will only try to use sudo when it detects a permission 
- error.
- 
- You can also choose not to provide the `--sudo-password` flag but then you 
- will be prompted for a sudo password about 90% of the way through the 
- duration of the inventory command.
-
 ### Playbook
 
 Building your application is only one piece of the puzzle. If you want to ship your application you have to host it somewhere. You have a few options when it comes to managed hosts like Heroku but they tend to be very expensive if you fall out of their free tier.
@@ -238,43 +214,78 @@ Everything is broken up into ansible roles so you can quickly scale out horizont
 - `nickjj.nginx` https://github.com/nickjj/ansible-nginx
 - `DavidWittman.redis` https://github.com/DavidWittman/ansible-redis
 
-All of the above roles will get installed and updated whenever you generate a new orats project.
+#### Playbook FAQ
 
-### Diff
+##### What is the Galaxyfile?
+
+It is similar to what a Gemfile is for ruby.
 
-The goal of the diff command is to provide you a way to compare your current 
-orats gem to the latest orats gem. It can also compare the difference between
- the orats generated version of an inventory/playbook to an 
- inventory/playbook that you generated and have customized.
+When you generate a playbook it will create a `roles` folder inside of the 
+target path you specified. The roles folder will contain all of the above 
+roles.
+
+When you run the playbook it will use these files when it provisions
+ your server(s).
  
- This comes in handy when you want to upgrade orats and your project. 
- You will be able to see if your inventory/playbook are missing any variables
-  or roles and it will also detect custom variables/roles that you have added.
-   
-It allows you to make 2 different types of comparisons:
+This allows you to easily update the versions of each ansible role without 
+having to download a new version of orats.
 
-#### Latest stable version of orats vs your version
+##### How do I update the roles for an existing playbook?
 
-When doing this type of comparison it only compares the actual files contained in the orats source code, not your generated inventory/playbook.
-    
-This is the type of comparison that is made when you run the `diff` command 
-without any arguments. It is useful to run this from time to time to 
-see if you are missing out on any new features in the latest version.
+Just run `orats playbook myplaybook` and it will overwrite 
+the roles in `myplaybook/roles` using the versions supplied in your 
+`Galaxyfile`. This is useful to run when a role requires a bug fix or new features were added.
+
+Since the roles are self contained in the playbook this allows you to have 
+multiple playbooks with certain role versions in case you have older orats 
+projects which require older role versions.
+
+### Diff
+
+The goal of the diff command is to compare your orats generated files with 
+the latest version to see what differences there are between the 2.
 
-#### Your orats version vs your custom project files
+You can compare nothing in which case it just gives you back your version of 
+the orats gem vs the latest gem version or you can add paths to 1 or all of the 
+files below.
 
-If you pass in the `--hosts`, `--inventory` and/or `--playbook` flags along 
-with a path to each of their files then it will compare the files contained 
-in the orats source code to your custom generated inventory/playbook.
+##### Galaxyfile
 
-If you stick with the orats naming convention and directory structure there 
-are a few quality of life enhancements. If you supply the path to the 
-inventory folder it will do a comparison on both the inventory and hosts file for you. If you supply the path to a 
-playbook folder it will automatically choose the `site.yml` playbook.
+When you supply the `--galaxyfile` flag along with a path to your `Galaxyfile` 
+it will show you a list of missing, outdated and extra roles with the versions.
+
+##### Playbook
+
+When you supply the `--playbook` flag along with a path to your 
+`site.yml` file it will show you a list of missing or extra roles.
+
+##### Hosts
+
+When you supply the `--hosts` flag along with a path to your `hosts` file it 
+will show you a list of missing or extra groups.
+
+##### Inventory
+
+When you supply the `--inventory` flag along with a path to your 
+`group_vars/all.yml` file it will show you a list of missing or extra variables.
+
+#### Wait, there is an easier way to compare everything
+
+If you kept the default file names for the files orats generated then you can
+ simply pass in the path to your inventory directory and playbook directory and
+  it will compare everything for you. This is much less annoying to type.
 
 #### Try the diff command
 
-`orats diff`
+##### Individual files
+
+`orats diff -g /path/to/playbook/Galaxyfile -p /path/to/playbook/site.yml -h 
+/path/to/project/inventory/hosts -i /path/to/project/inventory/group_vars/all
+.yml`
+
+##### Shortcut
+
+`orats diff -i /path/to/my/project/inventory -p /path/to/playbook`
 
 ### Templates
 
@@ -343,7 +354,7 @@ All of the changes have git commits to go with them. After generating a project
 
 #### Try the base template
 
-`orats project myapp --pg-password foo --skip-galaxy`
+`orats project myapp --pg-password foo`
 
 #### Base FAQ
 
@@ -353,16 +364,6 @@ Orats will automatically start your server (you can turn this off with a flag) a
 
 In order to do this it must know your postgres location, username and password. By default it will use localhost for the *location* and *postgres* as the username but if you need to supply those values because yours are different you can use `--pg-location foo` and `--pg-username bar`.
 
-##### What is `--skip-galaxy`?
-
-By default the project command will generate ansible related files for you so that you can manage this app's "inventory". It also automatically downloads the ansible roles from the [ansible galaxy](https://galaxy.ansible.com/).
-
-This was done to ensure each app you create has the correct ansible role version to go with it. However, if you installed ansible through apt or somewhere outside of your home directory then you will get permissions errors when it tries to download the roles.
-
-You can fix this by supplying `--sudo-password foo` to the above command if you know ansible is installed outside of your home directory or you can just wait while the command runs and it will prompt you for your sudo password when it gets to that point because orats will attempt to use sudo only after it fails trying to install the roles without sudo.
-
-If you don't care about the ansible at all you could add `--skip-ansible` to not generate any ansible files.
-
 ##### Does your redis server use a password?
 
 If your redis server is configured to use a password then you must also pass in `--redis-password foo`.
@@ -461,7 +462,7 @@ All of the changes have git commits to go with them. After generating a project
 
 #### Try the auth template
 
-`orats project myauthapp --auth --pg-password foo --skip-galaxy`
+`orats project myauthapp --template auth --pg-password foo`
 
 #### Auth FAQ
 

data/lib/orats/cli.rb

@@ -15,9 +15,7 @@ module Orats
     option :template, default: '', aliases: '-m'
     option :custom, default: '', aliases: '-c'
     option :skip_ansible, type: :boolean, default: false, aliases: '-A'
-    option :skip_server_start, type: :boolean, default: false, aliases: '-F'
-    option :sudo_password, default: '', aliases: '-s'
-    option :skip_galaxy, type: :boolean, default: false, aliases: '-G'
+    option :skip_server_start, type: :boolean, default: false, aliases: '-S'
     desc 'project TARGET_PATH [options]', ''
     long_desc <<-D
       `orats project target_path --pg-password supersecret` will create a new rails project and it will also create an ansible inventory to go with it by default.
@@ -47,29 +45,15 @@ module Orats
       `--skip-ansible` skip creating the ansible related directories [false]
 
       `--skip-server-start` skip automatically running puma and sidekiq [false]
-
-      Ansible features:
-
-      `--sudo-password` to install ansible roles from the galaxy to a path outside of your user privileges []
-
-      `--skip-galaxy` skip automatically installing roles from the galaxy [false]
     D
 
     def project(target_path)
       Commands::Project::Exec.new(target_path, options).init
     end
 
-    option :sudo_password, default: '', aliases: '-s'
-    option :skip_galaxy, type: :boolean, default: false, aliases: '-G'
     desc 'inventory TARGET_PATH [options]', ''
     long_desc <<-D
       `orats inventory target_path` will create an ansible inventory.
-
-      Configuration:
-
-      `--sudo-password` to install ansible roles from the galaxy to a path outside of your user privileges []
-
-      `--skip-galaxy` skip automatically installing roles from the galaxy [false]
     D
 
     def inventory(target_path)
@@ -81,9 +65,14 @@ module Orats
     long_desc <<-D
       `orats playbook target_path` will create an ansible playbook.
 
+      Help:
+
+      If you pass in an existing playbook path it will update the role versions.
+
       Template features:
 
-      `--custom` will let you supply a custom template, a url or file is ok but urls must start with http or https []
+      `--custom` will let you supply a custom template, a url or file is ok but urls
+ must start with http or https []
     D
 
     def playbook(target_path)
@@ -107,34 +96,33 @@ module Orats
       Commands::Nuke.new(target_path, options).init
     end
 
+    option :galaxyfile, default: '', aliases: '-g'
+    option :playbook, default: '', aliases: '-p'
     option :hosts, default: '', aliases: '-h'
     option :inventory, default: '', aliases: '-i'
-    option :playbook, default: '', aliases: '-b'
     desc 'diff [options]', ''
     long_desc <<-D
       `orats diff` will run various comparisons on orats and your ansible files.
 
-      Help:
-
-      `The green/yellow labels` denote a remote check to compare the files contained in your version of orats to the latest files on github.
+      Options:
 
-      `The blue/cyan labels` denote a local check between the files contained in your version of orats to the files you have generated such as your own playbook or inventories.
+      `--galaxyfile` to supply a galaxyfile for comparison []
 
-      Options:
+      `--playbook` to supply a playbook directory/file for comparison []
 
       `--hosts` to supply a hosts file for comparison []
 
       `--inventory` to supply an inventory directory/file for comparison []
 
-      `--playbook` to supply a playbook directory/file for comparison []
-
       Quality of life features:
 
-      `--inventory` also accepts a path to your project's inventory folder,
-if you kept the default file names it will automatically compare both your
-hosts and group_vars/all.yml files.
+      `--playbook` also accepts a playbook path, if you kept the
+default file names it will automatically compare both your Galaxyfile and
+site.yml files.
 
-      `--playbook` also accepts a path to a playbook folder, if you kept the playbook name as `site.yml` it will automatically choose it.
+      `--inventory` also accepts an inventory path, if you kept the
+default file names it will automatically compare both your hosts and
+group_vars/all.yml files.
     D
 
     def diff

data/lib/orats/commands/common.rb

@@ -12,9 +12,9 @@ module Orats
 
       RELATIVE_PATHS = {
           galaxyfile: 'templates/includes/playbook/Galaxyfile',
+          playbook:   'templates/includes/playbook/site.yml',
           hosts:      'templates/includes/inventory/hosts',
           inventory:  'templates/includes/inventory/group_vars/all.yml',
-          playbook:   'templates/includes/playbook/site.yml',
           version:    'version.rb'
       }
 

data/lib/orats/commands/diff/compare.rb

@@ -2,98 +2,103 @@ module Orats
   module Commands
     module Diff
       module Compare
-        def remote_to_local_gem_versions
-          log_remote_info 'gem', 'Compare this version of orats to the latest orats version',
-                          'version', "Latest: #{@remote_gem_version}, Yours: v#{VERSION}"
+        def remote_gem_vs_yours
+          log_remote_info 'gem',
+                          'Compare your orats version to the latest version',
+                          'version',
+                          "You have v#{VERSION} and the latest version is #{@remote_gem_version}"
         end
 
-        def remote_to_local_galaxyfiles
-          galaxyfile_diff            = @remote_galaxyfile - @local_galaxyfile
-          local_galaxyfile_as_string = @local_galaxyfile.join
-          local_galaxyfile_roles     = @local_galaxyfile.size
-          roles_diff_count           = galaxyfile_diff.size
+        def remote_vs_yours(label, remote, yours, exact_match)
+          log_remote_info label,
+                          "Compare your #{label} to the latest version (#{@remote_gem_version})",
+                          'file', File.basename(Common::RELATIVE_PATHS[label
+                                                                       .to_sym])
 
-          log_status_top 'roles', "Compare this version of orats' roles to the latest version:", :green
+          outdated_and_missing = difference(remote, yours, exact_match, true)
+          extras               = difference(yours, remote, exact_match)
+          both_lists           = outdated_and_missing + extras
+          sorted_diff          = sort_difference(both_lists).uniq { |item| item[:name] }
 
-          if roles_diff_count == 0
-            log_status_bottom 'message', "All #{local_galaxyfile_roles} roles are up to date", :yellow
+          if sorted_diff.empty?
+            log_status_bottom 'results', 'no differences were found',
+                              :magenta, true
           else
-            log_status_bottom 'message', "There are #{roles_diff_count} differences", :yellow
+            padded_length = pad_by(sorted_diff)
 
-            galaxyfile_diff.each do |line|
-              name   = line.split(',').first
-              status = 'outdated'
-              color  = :yellow
+            sorted_diff.each do |item|
+              name    = sorted_diff.empty? ? item[:name] : item[:name].ljust(padded_length)
+              version = item[:version].empty? ? '' : "#{set_color('|',
+                                                                  :cyan)} #{item[:version]}"
 
-              unless local_galaxyfile_as_string.include?(name)
-                status = 'missing'
-                color  = :red
-              end
-
-              log_status_bottom status, name, color, true
+              log_status_bottom item[:status], "#{name} #{version}",
+                                item[:color], true
             end
-
-            log_results 'The latest version of orats may benefit you', 'Check github to see if the changes interest you'
           end
         end
 
-        def remote_to_local(label, keyword, remote, local)
-          item_diff       = remote - local
-          item_diff_count = item_diff.size
+        private
 
-          log_remote_info label, "Compare this version of orats' #{label} to the latest version",
-                          'file',
-                          File.basename(Common::RELATIVE_PATHS[label.to_sym])
+        def name_and_version_from_line(line)
+          line.split(',')
+        end
 
-          item_diff.each do |line|
-            log_status_bottom 'missing', line, :red, true unless local.include?(line)
-          end
+        def pad_by(sorted_diff)
+          longest_role = sorted_diff.max_by { |s| s[:name].length }
+          longest_role[:name].length
+        end
 
-          if item_diff_count > 0
-            log_results "#{item_diff_count} new #{keyword} are available",
-                        'You may benefit from upgrading to the latest orats'
-          else
-            log_results 'Everything appears to be in order', "No missing #{keyword} were found"
-          end
+        def sort_difference(diff_list)
+          # custom sort order on the color key
+          diff_list.sort_by { |item| {red:    1,
+                                      yellow: 2,
+                                      green:  3}[item[:color]] }
         end
 
-        def local_to_user(label, keyword, flag_path, local)
-          user = yield
+        def difference(remote, yours, exact_match, missing_and_outdated = false)
+          @diff_list      = []
+          yours_as_string = yours.join
 
-          log_local_info label, "Compare this version of orats' #{label} to yours",
-                         'path', flag_path
+          if missing_and_outdated
+            diff = remote - yours
 
-          missing_count = log_unmatched(local, user, 'missing', :red)
-          extra_count   = log_unmatched(user, local, 'extra', :yellow)
+            diff.each do |line|
+              line_parts      = name_and_version_from_line(line)
+              status          = 'outdated'
+              color           = :yellow
+              search_contents = exact_match ? yours : yours_as_string
 
-          if missing_count > 0
-            log_results "#{missing_count} #{keyword} are missing",
-                        "Your ansible run will likely fail with this #{label}"
-          else
-            log_results 'Everything appears to be in order', "No missing #{keyword} were found"
-          end
-
-          if extra_count > 0
-            log_results "#{extra_count} extra #{keyword} were detected:",
-                        "No problem but remember to add them to future #{label}"
-          else
-            log_results "No extra #{keyword} were found:", "Extra #{keyword} are fine but you have none"
-          end
-        end
-
-        private
+              unless search_contents.include?(line_parts[0])
+                status = 'missing'
+                color  = :red
+              end
 
-        def log_unmatched(compare, against, label, color)
-          count = 0
+              @diff_list.push({
+                                  color:   color,
+                                  status:  status,
+                                  name:    line_parts[0],
+                                  version: line_parts[1] || ''
+                              })
 
-          compare.each do |item|
-            unless against.include?(item)
-              log_status_bottom label, item, color, true
-              count += 1
+            end
+          else
+            remote.each do |line|
+              unless yours.include?(line)
+                line_parts = name_and_version_from_line(line)
+                status     = 'extra'
+                color      = :green
+
+                @diff_list.push({
+                                    color:   color,
+                                    status:  status,
+                                    name:    line_parts[0],
+                                    version: line_parts[1] || ''
+                                })
+              end
             end
           end
 
-          count
+          @diff_list
         end
       end
     end

data/lib/orats/commands/diff/exec.rb

@@ -10,75 +10,49 @@ module Orats
         include Parse
         include Compare
 
+        attr_accessor :diff_list
+
         def initialize(target_path = '', options = {})
           super
 
           @remote_galaxyfile = galaxyfile url_to_string(@remote_paths[:galaxyfile])
+          @remote_playbook   = playbook url_to_string(@remote_paths[:playbook])
           @remote_hosts      = hosts url_to_string(@remote_paths[:hosts])
           @remote_inventory  = inventory url_to_string(@remote_paths[:inventory])
-          @remote_playbook   = playbook url_to_string(@remote_paths[:playbook])
-
-          @local_galaxyfile = galaxyfile file_to_string(@local_paths[:galaxyfile])
-          @local_hosts      = hosts file_to_string(@local_paths[:hosts])
-          @local_inventory  = inventory file_to_string(@local_paths[:inventory])
-          @local_playbook   = playbook file_to_string(@local_paths[:playbook])
-        end
-
-        def init
-          remote_to_local_gem_versions
-          remote_to_local_galaxyfiles
-          remote_to_local 'hosts', 'groups', @remote_hosts, @local_hosts
-          remote_to_local 'inventory', 'variables', @remote_inventory, @local_inventory
-          remote_to_local 'playbook', 'roles', @remote_playbook, @local_playbook
-
-          local_to_user_hosts @options[:hosts] unless @options[:hosts].empty?
-
-          unless @options[:inventory].empty?
-            inventory_path = @options[:inventory]
-
-            if File.directory?(inventory_path)
-              hosts_path = File.join(inventory_path, 'hosts')
-
-              inventory_path = File.join(inventory_path,
-                                         'group_vars/all.yml')
 
-              local_to_user_hosts hosts_path
-            end
+          galaxyfile_path = @options[:galaxyfile]
+          playbook_path   = @options[:playbook]
+          hosts_path      = @options[:hosts]
+          inventory_path  = @options[:inventory]
 
-            local_to_user_inventory inventory_path
+          if !@options[:inventory].empty? && File.directory?(@options[:inventory])
+            hosts_path     = File.join(inventory_path, 'hosts')
+            inventory_path = File.join(inventory_path, 'group_vars/all.yml')
           end
 
-          unless @options[:playbook].empty?
-            playbook_path = @options[:playbook]
-
-            if File.directory?(playbook_path)
-              playbook_path = File.join(playbook_path, 'site.yml')
-
-              local_to_user_playbook playbook_path
-            end
-
-            local_to_user_playbook playbook_path
+          if !@options[:playbook].empty? && File.directory?(@options[:playbook])
+            galaxyfile_path = File.join(playbook_path, 'Galaxyfile')
+            playbook_path   = File.join(playbook_path, 'site.yml')
           end
-        end
-
-        private
 
-        def local_to_user_hosts(path)
-          local_to_user('hosts', 'groups', path, @local_hosts) do
-            hosts file_to_string(path)
-          end
-        end
+          @your_galaxyfile = galaxyfile file_to_string (galaxyfile_path) unless galaxyfile_path.empty?
+          @your_playbook   = playbook file_to_string(playbook_path) unless playbook_path.empty?
+          @your_hosts      = hosts file_to_string(hosts_path) unless hosts_path.empty?
+          @your_inventory  = inventory file_to_string(inventory_path) unless inventory_path.empty?
 
-        def local_to_user_inventory(path)
-          local_to_user('inventory', 'variables', path, @local_inventory) do
-            inventory file_to_string(path)
-          end
         end
 
-        def local_to_user_playbook(path)
-          local_to_user('playbook', 'roles', path, @local_playbook) do
-            playbook file_to_string(path)
-          end
+        def init
+          remote_gem_vs_yours
+
+          remote_vs_yours('galaxyfile', @remote_galaxyfile,
+                          @your_galaxyfile, false) unless @your_galaxyfile.nil?
+          remote_vs_yours('playbook', @remote_playbook,
+                          @your_playbook, true) unless @your_playbook.nil?
+          remote_vs_yours('hosts', @remote_hosts,
+                          @your_hosts, true) unless @your_hosts.nil?
+          remote_vs_yours('inventory', @remote_inventory,
+                          @your_inventory, true) unless @your_inventory.nil?
         end
       end
     end

data/lib/orats/commands/inventory.rb

@@ -37,8 +37,6 @@ module Orats
         run "#{create_rsa_certificate(secrets_path,
                                       'monit.pem', 'monit.pem')} && openssl gendh 512 >> #{secrets_path}/monit.pem"
 
-        install_role_dependencies unless @options[:skip_galaxy]
-
         log_success
       end
 
@@ -79,25 +77,6 @@ module Orats
         "openssl req -new -newkey rsa:2048 -days 365 -nodes -x509 -subj '/C=US/ST=Foo/L=Bar/O=Baz/CN=qux.com' -keyout #{secrets_path}/#{keyout} -out #{secrets_path}/#{out}"
       end
 
-      def install_role_dependencies
-        log_task 'Update ansible roles from the galaxy'
-
-        galaxy_install =
-            "ansible-galaxy install -r #{base_path}/#{Common::RELATIVE_PATHS[:galaxyfile]} --force"
-
-        galaxy_out = run(galaxy_install, capture: true)
-
-        if galaxy_out.include?('you do not have permission')
-          if @options[:sudo_password].empty?
-            sudo_galaxy_command = 'sudo'
-          else
-            sudo_galaxy_command = "echo #{@options[:sudo_password]} | sudo -S"
-          end
-
-          run("#{sudo_galaxy_command} #{galaxy_install}")
-        end
-      end
-
       def log_success
         log_status_top 'success', 'Everything has been setup successfully',
                        :cyan

data/lib/orats/commands/playbook.rb

@@ -11,10 +11,49 @@ module Orats
       end
 
       def init
-        exit_if_path_exists
+        exit_if_updating_playbook
 
         rails_template 'playbook'
         custom_rails_template unless @options[:custom].empty?
+
+        galaxy_install
+        log_success
+      end
+
+      private
+
+      def exit_if_updating_playbook
+        galaxyfile = File.join(@target_path, 'Galaxyfile')
+
+        if File.exist?(galaxyfile)
+          galaxy_install 'Update'
+          exit 1
+        end
+      end
+
+      def galaxy_install(git_commit_type='Add')
+        log_task "#{git_commit_type} ansible roles from the galaxy"
+
+        galaxy_install = "ansible-galaxy install -r #{@target_path}/Galaxyfile --roles-path #{@target_path}/roles --force"
+
+        run galaxy_install
+
+        git_commit "#{git_commit_type} galaxy installed roles"
+      end
+
+      def log_success
+        log_status_top 'success', 'Everything has been setup successfully',
+                       :cyan
+        puts
+        log_status_bottom 'question', 'Are most of your apps similar?', :yellow, true
+        log_status_bottom 'answer', 'You only need to generate one playbook and you just did',
+                          :white, true
+        log_status_bottom 'answer', 'Use the inventory in each project to customize certain things', :white
+
+        log_status_bottom 'question', 'Are you new to ansible?', :yellow, true
+        log_status_bottom 'answer',
+                          'http://docs.ansible.com/intro_getting_started.html',
+                          :white
       end
     end
   end

data/lib/orats/commands/ui.rb

@@ -31,11 +31,6 @@ module Orats
       end
 
       def log_remote_info(top_label, top_message, bottom_label, bottom_message)
-        log_status_top top_label, "#{top_message}:", :green
-        log_status_bottom bottom_label, bottom_message, :yellow
-      end
-
-      def log_local_info(top_label, top_message, bottom_label, bottom_message)
         log_status_top top_label, "#{top_message}:", :blue
         log_status_bottom bottom_label, bottom_message, :cyan
       end

data/lib/orats/templates/includes/playbook/Galaxyfile

@@ -1,7 +1,7 @@
 nickjj.user,v0.1.0
-nickjj.security,v0.1.1
+nickjj.security,v0.1.2
 nickjj.postgres,v0.1.3
-nickjj.ruby,v0.1.5
+nickjj.ruby,v0.1.7
 nickjj.nodejs,v0.1.1
 nickjj.nginx,v0.1.4
 nickjj.rails,v0.1.92

data/lib/orats/templates/playbook.rb

@@ -81,10 +81,17 @@ end
 def add_main_playbook
   log_task __method__
 
-  copy_from_local_gem 'site.yml', 'site.yml'
+  copy_from_local_gem 'site.yml'
   git_commit 'Add the main playbook'
 end
 
+def add_galaxyfile
+  log_task __method__
+
+  copy_from_local_gem 'Galaxyfile'
+  git_commit 'Add the Galaxyfile'
+end
+
 def remove_unused_files_from_git
   log_task __method__
 
@@ -92,24 +99,11 @@ def remove_unused_files_from_git
   git_commit 'Remove unused files'
 end
 
-def log_complete
-  puts
-  say_status 'success', "\e[1m\Everything has been setup successfully\e[0m", :cyan
-  puts
-  say_status 'question', 'Are most of your apps similar?', :yellow
-  say_status 'answer', 'You only need to generate one playbook and you just did', :white
-  say_status 'answer', 'Use the inventory in each project to customize certain things', :white
-  puts
-  say_status 'question', 'Are you new to ansible?', :yellow
-  say_status 'answer', 'http://docs.ansible.com/intro_getting_started.html', :white
-  puts
-end
-
 # ---
 
 delete_generated_rails_code
 add_playbook_directory
 add_license
 add_main_playbook
-remove_unused_files_from_git
-log_complete
+add_galaxyfile
+remove_unused_files_from_git

data/lib/orats/version.rb

@@ -1,3 +1,3 @@
 module Orats
-  VERSION = '0.7.0'
+  VERSION = '0.7.1'
 end

data/test/integration/cli_test.rb

@@ -42,11 +42,43 @@ class TestCLI < Minitest::Test
     assert_playbook
   end
 
+  def test_playbook_update_roles
+    target_path = generate_app_name
+
+    assert_playbook target_path
+    assert_playbook target_path
+  end
+
   def test_diff
-    assert_playbook
+    assert_diff
 
-    @target_path = ''
-    assert_orats 'diff', 'Compare this version of'
+    out, err = capture_orats('diff')
+
+    assert_count out, 'gem', 1
+    assert_count out, 'missing', 0
+    assert_count out, 'outdated', 0
+    assert_count out, 'extra', 0
+  end
+
+  def test_diff_with_differences
+    file_paths = assert_diff
+
+    hosts_path      = "#{file_paths[0]}/hosts"
+    inventory_path  = "#{file_paths[0]}/group_vars/all.yml"
+    galaxyfile_path = "#{file_paths[1]}/Galaxyfile"
+    site_path       = "#{file_paths[1]}/site.yml"
+
+    gsub_file(hosts_path, '[cache]', '[something]')
+    gsub_file(inventory_path, 'postgres_user', 'hello_world')
+    gsub_file(galaxyfile_path, /nickjj.ruby,v.*$/, "nickjj.ruby,v0.1.2\nfoo")
+    gsub_file(site_path, 'nickjj.whenever', 'bar')
+
+    out, err = capture_orats('diff')
+
+    assert_count out, 'gem', 1
+    assert_count out, 'missing', 3
+    assert_count out, 'outdated', 1
+    assert_count out, 'extra', 4
   end
 
   def test_templates
@@ -62,7 +94,7 @@ class TestCLI < Minitest::Test
   def assert_orats(command, match_regex, ansible: nil)
     out, err = capture_orats(command)
 
-    assert_match /#{match_regex}/, out
+    assert_match /#{match_regex}/, out, err unless match_regex.empty?
 
     assert_or_refute_ansible ansible if ansible
   end
@@ -93,19 +125,33 @@ class TestCLI < Minitest::Test
 
   def assert_inventory
     @target_path = generate_app_name
-    @extra_flags = '--skip-galaxy'
 
     assert_orats 'inventory', 'success'
+    assert_path "#{TEST_PATH}/#{@target_path}/inventory/hosts"
     assert_ansible_yaml "#{TEST_PATH}/#{@target_path}/inventory/group_vars/all.yml"
   end
 
-  def assert_playbook
-    @target_path = generate_app_name
+  def assert_playbook(target_path = generate_app_name)
+    @target_path = target_path
 
     assert_orats 'playbook', 'success'
+    assert_path "#{TEST_PATH}/#{@target_path}/Galaxyfile"
     assert_ansible_yaml "#{TEST_PATH}/#{@target_path}/site.yml"
   end
 
+  def assert_diff
+    assert_inventory
+    inventory_path = "#{TEST_PATH}/#{@target_path}/inventory"
+
+    assert_playbook
+    playbook_path = "#{TEST_PATH}/#{@target_path}"
+
+    @target_path = ''
+    @extra_flags = "-i #{inventory_path} -p #{playbook_path}"
+
+    [inventory_path, playbook_path]
+  end
+
   def assert_nuked(options = {})
     out, err = capture_subprocess_io do
       orats "nuke #{@target_path}", flags: options[:flags], answer: 'y'
@@ -115,6 +161,11 @@ class TestCLI < Minitest::Test
     system "rm -rf #{TEST_PATH}"
   end
 
+  def assert_count(input, regex, expected)
+    assert input.scan(regex).size == expected,
+           "Found #{input.scan(regex).size} matches for '#{regex}' but expected #{expected}"
+  end
+
   def assert_in_file(file_path, match_regex)
     file_contents = `cat #{file_path}`
     assert_match /#{match_regex}/, file_contents
@@ -179,4 +230,11 @@ class TestCLI < Minitest::Test
     puts '-'*80
     puts
   end
+
+  def gsub_file(file_path, replace, with)
+    IO.write(file_path, File.open(file_path) do |f|
+      f.read.gsub(replace, with)
+    end
+    )
+  end
 end

data/test/test_helper.rb

@@ -15,8 +15,10 @@ module Orats
 
     CREDENTIALS = "-l #{POSTGRES_LOCATION} -u #{POSTGRES_USERNAME} -p #{POSTGRES_PASSWORD} -n #{REDIS_LOCATION} -d #{REDIS_PASSWORD}"
 
+    INCLUDES_PATH   = File.absolute_path('../../lib/orats/templates/includes',
+                                         __FILE__)
     BINARY_PATH     = File.absolute_path('../../bin/orats', __FILE__)
-    ORATS_NEW_FLAGS = "#{CREDENTIALS} -FG"
+    ORATS_NEW_FLAGS = "#{CREDENTIALS} -S"
 
     def orats(command, options = {})
       cmd, app_name   = command.split(' ')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orats
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Nick Janetakis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-20 00:00:00.000000000 Z
+date: 2014-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor