chef-rundeck 0.2.0 → 1.0.0

data/README.md

@@ -0,0 +1,31 @@
+# chef-rundeck
+[![Gem Version](https://badge.fury.io/rb/chef-rundeck.png)](http://badge.fury.io/rb/chef-rundeck)
+[![Build Status](https://secure.travis-ci.org/oswaldlabs/chef-rundeck.png?branch=master)](http://travis-ci.org/oswaldlabs/chef-rundeck)
+[![Dependency Status](https://gemnasium.com/oswaldlabs/chef-rundeck.png?travis)](https://gemnasium.com/oswaldlabs/chef-rundeck)
+[![Code Climate](https://codeclimate.com/github/oswaldlabs/chef-rundeck.png)](https://codeclimate.com/github/oswaldlabs/chef-rundeck)
+
+A simple Sinatra app that presents matching node results of a Chef search formatted as a RunDeck resource list.
+
+## Usage
+
+Install the gem and fire up chef-rundeck.  Point it at a Chef client config file (a knife config would be ideal) and provide the URI for your Chef server's web UI.
+
+## Configuration Notes
+
+More to come.
+
+## Notes on Patches/Pull Requests
+
+We want your cool additional feature.  Here's how to give it to us:
+
+* Fork the project.
+* Make your feature addition or bug fix.
+* Add tests for it.  *THIS IS IMPORTANT* as it ensures no one else will break your feature accidentally somewhere down the line.
+* If you're adding a feature, please also add documentation.
+* *Exception:* Please don't change the Rakefile, version or history files!
+* Commit your changes and push them to your GitHub repo.  Bonus points for committing your changes to a named topic branch ("awesome_new_feature" > "master")
+* Send us a pull request through the GitHub UI.
+
+# Copyright
+
+Original code © 2010 Adam Jacob.  Released to the open source community under the Apache license in 2013.  See the LICENSE file for details.

data/Rakefile

@@ -23,6 +23,7 @@ rescue LoadError
 end
 
 require 'rspec/core/rake_task'
+ENV['TRAVIS_BUILD_DIR'] = "." unless ENV.has_key?('TRAVIS_BUILD_DIR')
 RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.rspec_opts = [ '-I', 'lib', '-I', 'spec' ]
   spec.pattern = FileList['spec/**/*_spec.rb']
@@ -34,8 +35,6 @@ RSpec::Core::RakeTask.new(:rcov) do |spec|
   spec.rcov = true
 end
 
-task :spec => :check_dependencies
-
 task :default => :spec
 
 begin

data/VERSION

@@ -1 +1 @@
-0.2.0
+1.0.0

data/bin/chef-rundeck

@@ -23,12 +23,22 @@ require 'mixlib/cli'
 
 class ChefRundeckCLI
   include Mixlib::CLI
+
+   option :api_url,
+     :short => "-a API_URL",
+     :long => "--api-url API_URL",
+     :description => "The base URL of the Chef REST API"
+
+   option :client_key,
+     :short => "-k KEYFILE",
+     :long => "--key-file KEYFILE",
+     :description => "The client.pem to sign requests"
  
    option :config_file,
-      :short => "-c CONFIG",
-      :long  => "--config CONFIG",
-      :default => 'config.rb',
-      :description => "The Chef configuration file to use"
+     :short => "-c CONFIG",
+     :long  => "--config CONFIG",
+     :default => 'config.rb',
+     :description => "The Chef configuration file to use"
 
    option :username,
      :short => "-u USERNAME",
@@ -39,13 +49,20 @@ class ChefRundeckCLI
    option :web_ui_url,
      :short => "-w WEB_UI_URL",
      :long => "--web-ui-url WEB_UI_URL",
-     :description => "The base URL of the Chef Web UI"
+     :description => "The base URL of the Chef Web UI",
+     :default => "https://manage.opscode.com"
 
    option :port,
      :short => "-p PORT",
      :long => "--port PORT",
      :description => "The port to run on, default 9980",
      :default => 9980
+
+   option :pidfile,
+     :short => "-P FILE",
+     :long => "--pidfile FILE",
+     :description => "Prefix for our PID file, default: /var/run/chef-rundeck- ('PORT.pid' will be added)",
+     :default => "/var/run/chef-rundeck"
 end
 
 cli = ChefRundeckCLI.new
@@ -54,7 +71,18 @@ cli.parse_options
 ChefRundeck.config_file = cli.config[:config_file]
 ChefRundeck.username = cli.config[:username]
 ChefRundeck.web_ui_url = cli.config[:web_ui_url]
+ChefRundeck.api_url = cli.config[:api_url]
+ChefRundeck.client_key = cli.config[:client_key]
 ChefRundeck.configure
 
+begin
+   pid = "#{cli.config[:pidfile]}-#{cli.config[:port]}.pid"
+   puts "Writing to #{pid}"
+   File.open(pid, 'w'){ |f| f.write(Process.pid) }
+   at_exit { File.delete(pid) if File.exist?(pid) }
+rescue Exception => e
+   puts "== Error writing pid file #{pid}!"
+end
+
 ChefRundeck.run! :host => 'localhost', :port => cli.config[:port] 
 

data/lib/chef-rundeck.rb

@@ -1,12 +1,12 @@
 #
 # Copyright 2010, Opscode, Inc.
-# 
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,6 +18,7 @@ require 'sinatra/base'
 require 'chef'
 require 'chef/node'
 require 'chef/mixin/xml_escape'
+require 'chef/rest'
 
 class ChefRundeck < Sinatra::Base
 
@@ -26,39 +27,51 @@ class ChefRundeck < Sinatra::Base
   class << self
     attr_accessor :config_file
     attr_accessor :username
+    attr_accessor :api_url
     attr_accessor :web_ui_url
+    attr_accessor :client_key
 
     def configure
       Chef::Config.from_file(ChefRundeck.config_file)
       Chef::Log.level = Chef::Config[:log_level]
+
+      unless ChefRundeck.api_url
+        ChefRundeck.api_url = Chef::Config[:chef_server_url]
+      end
+
+      unless ChefRundeck.client_key
+        ChefRundeck.client_key = Chef::Config[:client_key]
+      end
     end
   end
 
   get '/' do
     content_type 'text/xml'
     response = '<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE project PUBLIC "-//DTO Labs Inc.//DTD Resources Document 1.0//EN" "project.dtd"><project>'
-    Chef::Node.list(true).each do |node_array|
-      node = node_array[1]
+    rest = Chef::REST.new(ChefRundeck.api_url, ChefRundeck.username, ChefRundeck.client_key)
+    nodes = rest.get_rest("/nodes/")    
+      
+    nodes.keys.each do |node_name|
+      node = rest.get_rest("/nodes/#{node_name}")
       #--
       # Certain features in Rundeck require the osFamily value to be set to 'unix' to work appropriately. - SRK
       #++
       os_family = node[:kernel][:os] =~ /windows/i ? 'windows' : 'unix'
       response << <<-EOH
-<node name="#{xml_escape(node[:fqdn])}" 
-      type="Node" 
-      description="#{xml_escape(node.name)}"
+<node name="#{xml_escape(node[:fqdn])}"
+      type="Node"
+      description="#{xml_escape(node_name)}"
       osArch="#{xml_escape(node[:kernel][:machine])}"
       osFamily="#{xml_escape(os_family)}"
       osName="#{xml_escape(node[:platform])}"
       osVersion="#{xml_escape(node[:platform_version])}"
-      tags="#{xml_escape([node.chef_environment, node.run_list.roles.join(',')].join(','))}"
+      tags="#{xml_escape([node.chef_environment, node[:tags].join(','), node.run_list.roles.join(',')].join(','))}"
       username="#{xml_escape(ChefRundeck.username)}"
       hostname="#{xml_escape(node[:fqdn])}"
-      editUrl="#{xml_escape(ChefRundeck.web_ui_url)}/nodes/#{xml_escape(node.name)}/edit"/>
+      editUrl="#{xml_escape(ChefRundeck.web_ui_url)}/nodes/#{xml_escape(node_name)}/edit"/>
 EOH
     end
     response << "</project>"
     response
   end
 end
-

data/spec/chef-rundeck_spec.rb

@@ -1,7 +1,20 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'spec_helper'
+require 'nokogiri'
 
-describe "ChefRundeck" do
-  it "fails" do
-    fail "hey buddy, you should probably rename this file and start specing for real"
+describe 'ChefRundeck' do
+  before do
+    # setup for the following tests
+    ChefRundeck.config_file = "#{ENV['TRAVIS_BUILD_DIR']}/spec/support/client.rb"
+    ChefRundeck.username = ENV['USER']
+    ChefRundeck.web_ui_url = 'https://manage.opscode.com'
+    ChefRundeck.configure
+  end
+  it 'fetch to root should return 200' do
+    get '/' 
+    last_response.should be_ok
+  end
+  it 'fetched document should be Nokogiri-parseable XML document' do
+    get '/'
+    Nokogiri::XML(last_response.body).document.should be_true
   end
 end

data/spec/spec_helper.rb

@@ -1,9 +1,21 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'chef-rundeck'
-require 'spec'
-require 'spec/autorun'
+require 'sinatra'
+require 'rspec'
+require 'rspec/autorun'
+require 'rack/test'
 
-Spec::Runner.configure do |config|
-  
+
+set :environment, :test
+set :run, false
+set :raise_errors, true
+set :logging, false
+
+  def app
+    ChefRundeck.new
+  end
+
+RSpec.configure do |config|
+  config.include Rack::Test::Methods
 end

metadata

@@ -1,11 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: chef-rundeck
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
 - Adam Jacob
+- Brian Scott
+- Steven Wagner
 autorequire: 
 bindir: bin
 cert_chain: []
@@ -13,7 +15,7 @@ date: 2011-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70246891990460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +23,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70246891990460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: chef
-  requirement: &70246891989140 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +39,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70246891989140
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
-  requirement: &70246892003620 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +55,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70246892003620
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70246892000840 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +71,15 @@ dependencies:
         version: 1.2.9
   type: :development
   prerelease: false
-  version_requirements: *70246892000840
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.9
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70246891998520 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,29 +87,65 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70246891998520
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Provides a resource endpoint for RunDeck from a Chef Server
-email: adam@opscode.com
+email: brainscott@gmail.com
 executables:
 - chef-rundeck
 extensions: []
 extra_rdoc_files:
 - LICENSE
-- README.rdoc
+- README.md
 files:
 - .document
 - LICENSE
 - NOTICE
-- README.rdoc
+- README.md
 - Rakefile
 - VERSION
 - bin/chef-rundeck
-- chef-rundeck.gemspec
 - lib/chef-rundeck.rb
 - spec/chef-rundeck_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-homepage: http://github.com/opscode/chef-rundeck
+homepage: http://github.com/oswaldlabs/chef-rundeck
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -107,8 +165,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Integrates Chef with RunDeck
 test_files: []
+has_rdoc: 

data/README.rdoc

@@ -1,19 +0,0 @@
-= chef-rundeck
-
-Integrates Chef with RunDeck.
-
-Install the gem and fire up chef-rundeck - point it at a Chef Client configuration file (the one you use for knife would be ideal), and provide the URI for your Chef Server Web UI.
-
-== Note on Patches/Pull Requests
- 
-* Fork the project.
-* Make your feature addition or bug fix.
-* Add tests for it. This is important so I don't break it in a
-  future version unintentionally.
-* Commit, do not mess with rakefile, version, or history.
-  (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
-* Send me a pull request. Bonus points for topic branches.
-
-== Copyright
-
-Copyright (c) 2010 Adam Jacob. See LICENSE for details.

data/chef-rundeck.gemspec

@@ -1,63 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = "chef-rundeck"
-  s.version = "0.2.0"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Adam Jacob"]
-  s.date = "2011-11-07"
-  s.description = "Provides a resource endpoint for RunDeck from a Chef Server"
-  s.email = "adam@opscode.com"
-  s.executables = ["chef-rundeck"]
-  s.extra_rdoc_files = [
-    "LICENSE",
-    "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-    "LICENSE",
-    "NOTICE",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "bin/chef-rundeck",
-    "chef-rundeck.gemspec",
-    "lib/chef-rundeck.rb",
-    "spec/chef-rundeck_spec.rb",
-    "spec/spec.opts",
-    "spec/spec_helper.rb"
-  ]
-  s.homepage = "http://github.com/opscode/chef-rundeck"
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
-  s.summary = "Integrates Chef with RunDeck"
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<sinatra>, [">= 0"])
-      s.add_runtime_dependency(%q<chef>, [">= 0"])
-      s.add_runtime_dependency(%q<mixlib-cli>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
-      s.add_development_dependency(%q<yard>, [">= 0"])
-    else
-      s.add_dependency(%q<sinatra>, [">= 0"])
-      s.add_dependency(%q<chef>, [">= 0"])
-      s.add_dependency(%q<mixlib-cli>, [">= 0"])
-      s.add_dependency(%q<rspec>, [">= 1.2.9"])
-      s.add_dependency(%q<yard>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<sinatra>, [">= 0"])
-    s.add_dependency(%q<chef>, [">= 0"])
-    s.add_dependency(%q<mixlib-cli>, [">= 0"])
-    s.add_dependency(%q<rspec>, [">= 1.2.9"])
-    s.add_dependency(%q<yard>, [">= 0"])
-  end
-end
-