dokku-installer-cli 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65a83d6493fffaef67b6402f60ac3969bb7b9003
-  data.tar.gz: f3ebdfea751e8537e3ecf15a631f92a269121817
+  metadata.gz: f8c9b3e47ef0682a395814ffc17e00f5f424eeb1
+  data.tar.gz: afb39376e3eb7fbb78652257cc1b934c9421d468
 SHA512:
-  metadata.gz: 879545f43c552a1f0efe571822a0468aa6b72b9d356982154ee08e66a0e1ba8d5769690268a37cf05edfbcd5736878815a8c6d9459275275f3c59879a2dadf12
-  data.tar.gz: 0eda2f802ee10297c3f507d186ec8d834f99b394317eb5ff25457aff0ba38a26f2dae3d64fca7348154d86e68c3da5cdf1168318abc79452368d192eb911e382
+  metadata.gz: a69972a662e9aeccd4cefdaa475d8df4aca6c886197b9ef8f29d046f2cbdb6f4d8b7b7f7301ce7a4297aa11791b8b5702aa0b60c182118aa530c591455275a92
+  data.tar.gz: b85b02d1658e17ae803602cc7ca3c38f51c9b18f26f63c95c3e06d2cb5243a4230c96d005db76ba899fa69fb6d03a95c517843268cfc29d5704916ffd4ca37cd

data/Gemfile.lock

@@ -1,44 +1,16 @@
 PATH
   remote: .
   specs:
-    dokku-installer-cli (0.0.1)
-      methadone (~> 1.8.0)
+    dokku-installer-cli (0.0.3)
+      thor (~> 0.19)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    aruba (0.6.1)
-      childprocess (>= 0.3.6)
-      cucumber (>= 1.1.1)
-      rspec-expectations (>= 2.7.0)
-    builder (3.2.2)
-    childprocess (0.5.5)
-      ffi (~> 1.0, >= 1.0.11)
-    cucumber (1.3.17)
-      builder (>= 2.1.2)
-      diff-lcs (>= 1.1.3)
-      gherkin (~> 2.12)
-      multi_json (>= 1.7.5, < 2.0)
-      multi_test (>= 0.1.1)
-    diff-lcs (1.2.5)
-    ffi (1.9.6)
-    gherkin (2.12.2)
-      multi_json (~> 1.3)
-    methadone (1.8.0)
-      bundler
-    multi_json (1.10.1)
-    multi_test (0.1.1)
-    rake (10.3.2)
-    rspec-expectations (3.1.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.1.0)
-    rspec-support (3.1.2)
+    thor (0.19.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  aruba (~> 0.6)
-  bundler (~> 1.7)
   dokku-installer-cli!
-  rake (~> 10.0)

data/{LICENSE.txt → LICENSE}

@@ -1,4 +1,4 @@
-Name: dokku_installer_cli
+Name: dokku-installer-cli
 Copyright (c) 2014 Brian Pattison
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

data/README.md

@@ -1,26 +1,32 @@
-# DokkuInstallerCli
+# Dokku Installer CLI
 
-TODO: Write a gem description
+Command line tool for Dokku Installer.
 
 ## Installation
 
 Add this line to your application's Gemfile:
 
-```ruby
-gem 'dokku_installer_cli'
+```bash
+$ gem install dokku-installer-cli
 ```
 
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install dokku_installer_cli
-
 ## Usage
 
-TODO: Write usage instructions here
+```bash
+$ dokku help
+
+Commands:
+  dokku config                                    # Display the app's environment variables
+  dokku config:get KEY                            # Display an environment variable value
+  dokku config:set KEY1=VALUE1 [KEY2=VALUE2 ...]  # Set one or more environment variables
+  dokku config:unset KEY1 [KEY2 ...]              # Unset one or more environment variables
+  dokku domains                                   # Display the app's domains
+  dokku domains:set DOMAIN1 [DOMAIN2 ...]         # Set one or more domains
+  dokku help [COMMAND]                            # Describe available commands or one specific command
+  dokku logs [-t]                                 # Show the last logs for the application (-t follows)
+  dokku run <cmd>                                 # Run a command in the environment of an application
+  dokku version                                   # Print dokku-installer-cli's version
+```
 
 ## Contributing
 

data/bin/dokku

@@ -1,76 +1,105 @@
 #!/usr/bin/env ruby
 
-require "optparse"
-require "methadone"
-require "dokku_installer_cli.rb"
-
-class App
-  include Methadone::Main
-  include Methadone::CLILogging
-
-  main do |command, *args|
-    git_config = File.join(Dir.pwd, ".git", "config")
-    exit unless File.exist?(git_config)
-
-    git_config = File.read(git_config)
-    match = git_config.match(/url \= dokku@(.*):(.*)\n/).to_a
-    exit unless match
-
-    domain = match[1]
-    app_name = match[2]
-
-    dokku_command = "ssh -t dokku@#{domain} "
-
-    case command
-    when "config"
-      dokku_command += "config #{app_name}"
-    when "config:get"
-      dokku_command += "config:get #{app_name} #{args.first}"
-    when "config:set"
-      dokku_command += "config:set #{app_name} #{args.join(' ')}"
-    when "config:unset"
-      dokku_command += "config:unset #{app_name} #{args.join(' ')}"
-    when "create"
-      dokku_command += "create #{args.first}"
-    when "domains"
-      dokku_command += "domains #{app_name}"
-    when "domains:set"
-      dokku_command += "domains:set #{app_name} #{args.join(' ')}"
-    when "logs"
-      dokku_command += "logs #{app_name} #{args.join(' ')}"
-    when "run"
-      command = args.join(" ")
-      dokku_command += "run #{app_name} #{command}"
-    else
-      exit
+require "thor"
+
+module DokkuInstaller
+  class Cli < Thor
+
+    desc "config", "Display the app's environment variables"
+    def config
+      run_command "config #{app_name}"
     end
 
-    puts "Running #{dokku_command}..."
-    exec(dokku_command)
-  end
+    desc "config:get KEY", "Display an environment variable value"
+    def config_get(*args)
+      run_command "config:get #{app_name} #{args.first}"
+    end
+
+    desc "config:set KEY1=VALUE1 [KEY2=VALUE2 ...]", "Set one or more environment variables"
+    def config_set(*args)
+      run_command "config:set #{app_name} #{args.join(' ')}"
+    end
+
+    desc "config:unset KEY1 [KEY2 ...]", "Unset one or more environment variables"
+    def config_unset(*args)
+      run_command "config:unset #{app_name} #{args.join(' ')}"
+    end
+
+    # desc "create", "Create an app"
+    # def create(*args)
+    #   run_command "create #{args.first}"
+    # end
+
+    desc "domains", "Display the app's domains"
+    def domains(*args)
+      run_command "domains #{app_name}"
+    end
+
+    desc "domains:set DOMAIN1 [DOMAIN2 ...]", "Set one or more domains"
+    def domains_set(*args)
+      run_command "domains:set #{app_name} #{args.join(' ')}"
+    end
+
+    desc "logs [-t]", "Show the last logs for the application (-t follows)"
+    def logs(*args)
+      run_command "logs #{app_name} #{args.join(' ')}"
+    end
+
+    desc "run <cmd>", "Run a command in the environment of an application"
+    def walk(*args)
+      run_command "run #{app_name} #{args.join(' ')}"
+    end
+
+    desc "version", "Print dokku-installer-cli's version"
+    def version
+      puts "Dokku Installer CLI #{DokkuInstaller::VERSION}"
+    end
+
+    def help(method = nil)
+      method = "walk" if method == "run"
+      super
+    end
+
+    def method_missing(method, *args, &block)
+      if method.to_s.split(":").length == 2
+        self.send(method.to_s.gsub(":", "_"), *args)
+      elsif method == :run
+        self.walk(*args)
+      else
+        super
+      end
+    end
+
+  private
+
+    def app_name
+      @app_name ||= git_config_match[2]
+    end
+
+    def domain
+      @domain ||= git_config_match[1]
+    end
+
+    def git_config_match
+      @git_config_match ||= begin
+        git_config = File.join(Dir.pwd, ".git", "config")
+        exit unless File.exist?(git_config)
+
+        git_config = File.read(git_config)
+        match = git_config.match(/url \= dokku@(.*):(.*)\n/).to_a
+        exit unless match
+
+        match
+      end
+    end
 
-  description "Command line tool for Dokku Installer"
-
-  arg :command
-  #
-  # Accept flags via:
-  # on("--flag VAL","Some flag")
-  # options[flag] will contain VAL
-  #
-  # Specify switches via:
-  # on("--[no-]switch","Some switch")
-  #
-  # Or, just call OptionParser methods on opts
-  #
-  # Require an argument
-  # arg :some_arg
-  #
-  # # Make an argument optional
-  # arg :optional_arg, :optional
-
-  version DokkuInstallerCli::VERSION
-
-  use_log_level_option :toggle_debug_on_signal => "USR1"
-
-  go!
+    def run_command(command)
+      dokku_command = "ssh -t dokku@#{domain} #{command}"
+
+      puts "Running #{dokku_command}..."
+      exec(dokku_command)
+    end
+  end
 end
+
+DokkuInstaller::Cli.start(ARGV)

data/dokku_installer_cli.gemspec

@@ -1,11 +1,11 @@
 # coding: utf-8
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "dokku_installer_cli/version"
+require "dokku_installer/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "dokku-installer-cli"
-  spec.version       = DokkuInstallerCli::VERSION
+  spec.version       = DokkuInstaller::VERSION
   spec.authors       = ["Brian Pattison"]
   spec.email         = ["brian@brianpattison.com"]
   spec.summary       = %q{Command line tool for Dokku Installer}
@@ -14,12 +14,7 @@ Gem::Specification.new do |spec|
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "methadone", "~> 1.8.0"
-
-  spec.add_development_dependency "bundler", "~> 1.7"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "aruba", "~> 0.6"
+  spec.add_dependency "thor", "~> 0.19"
 end

data/lib/dokku_installer/version.rb

@@ -0,0 +1,3 @@
+module DokkuInstaller
+  VERSION = "0.0.3"
+end

metadata

@@ -1,71 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: dokku-installer-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Brian Pattison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-11 00:00:00.000000000 Z
+date: 2014-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: methadone
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: '0.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
-- !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: aruba
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.19'
 description: 
 email:
 - brian@brianpattison.com
@@ -77,18 +35,12 @@ files:
 - ".gitignore"
 - Gemfile
 - Gemfile.lock
-- LICENSE.txt
+- LICENSE
 - README.md
-- README.rdoc
-- Rakefile
 - bin/dokku
 - dokku_installer_cli.gemspec
-- features/dokku_installer_cli.feature
-- features/step_definitions/dokku_installer_cli_steps.rb
-- features/support/env.rb
-- lib/dokku_installer_cli.rb
-- lib/dokku_installer_cli/version.rb
-- test/tc_something.rb
+- lib/dokku_installer.rb
+- lib/dokku_installer/version.rb
 homepage: https://github.com/brianpattison/dokku-installer-cli
 licenses:
 - MIT
@@ -113,8 +65,4 @@ rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Command line tool for Dokku Installer
-test_files:
-- features/dokku_installer_cli.feature
-- features/step_definitions/dokku_installer_cli_steps.rb
-- features/support/env.rb
-- test/tc_something.rb
+test_files: []

data/README.rdoc

@@ -1,23 +0,0 @@
-= dokku_installer_cli - DESCRIBE YOUR GEM
-
-Author::  YOUR NAME (YOUR EMAIL)
-Copyright:: Copyright (c) 2014 YOUR NAME
-
-
-License:: mit, see LICENSE.txt
-
-
-
-DESCRIBE YOUR GEM HERE
-
-== Links
-
-* {Source on Github}[LINK TO GITHUB]
-* RDoc[LINK TO RDOC.INFO]
-
-== Install
-
-== Examples
-
-== Contributing
-

data/Rakefile

@@ -1,61 +0,0 @@
-def dump_load_path
-  puts $LOAD_PATH.join("\n")
-  found = nil
-  $LOAD_PATH.each do |path|
-    if File.exists?(File.join(path,"rspec"))
-      puts "Found rspec in #{path}"
-      if File.exists?(File.join(path,"rspec","core"))
-        puts "Found core"
-        if File.exists?(File.join(path,"rspec","core","rake_task"))
-          puts "Found rake_task"
-          found = path
-        else
-          puts "!! no rake_task"
-        end
-      else
-        puts "!!! no core"
-      end
-    end
-  end
-  if found.nil?
-    puts "Didn't find rspec/core/rake_task anywhere"
-  else
-    puts "Found in #{path}"
-  end
-end
-require 'bundler'
-require 'rake/clean'
-
-require 'rake/testtask'
-
-require 'cucumber'
-require 'cucumber/rake/task'
-gem 'rdoc' # we need the installed RDoc gem, not the system one
-require 'rdoc/task'
-
-include Rake::DSL
-
-Bundler::GemHelper.install_tasks
-
-
-Rake::TestTask.new do |t|
-  t.pattern = 'test/tc_*.rb'
-end
-
-
-CUKE_RESULTS = 'results.html'
-CLEAN << CUKE_RESULTS
-Cucumber::Rake::Task.new(:features) do |t|
-  t.cucumber_opts = "features --format html -o #{CUKE_RESULTS} --format pretty --no-source -x"
-  t.fork = false
-end
-
-Rake::RDocTask.new do |rd|
-  
-  rd.main = "README.rdoc"
-  
-  rd.rdoc_files.include("README.rdoc","lib/**/*.rb","bin/**/*")
-end
-
-task :default => [:test,:features]
-

data/features/dokku_installer_cli.feature

@@ -1,13 +0,0 @@
-Feature: My bootstrapped app kinda works
-  In order to get going on coding my awesome app
-  I want to have aruba and cucumber setup
-  So I don't have to do it myself
-
-  Scenario: App just runs
-    When I get help for "dokku_installer_cli"
-    Then the exit status should be 0
-    And the banner should be present
-    And the banner should document that this app takes options
-    And the following options should be documented:
-      |--version|
-    And the banner should document that this app takes no arguments

data/features/step_definitions/dokku_installer_cli_steps.rb

@@ -1 +0,0 @@
-# Put your step definitions here

data/features/support/env.rb

@@ -1,16 +0,0 @@
-require 'aruba/cucumber'
-require 'methadone/cucumber'
-
-ENV['PATH'] = "#{File.expand_path(File.dirname(__FILE__) + '/../../bin')}#{File::PATH_SEPARATOR}#{ENV['PATH']}"
-LIB_DIR = File.join(File.expand_path(File.dirname(__FILE__)),'..','..','lib')
-
-Before do
-  # Using "announce" causes massive warnings on 1.9.2
-  @puts = true
-  @original_rubylib = ENV['RUBYLIB']
-  ENV['RUBYLIB'] = LIB_DIR + File::PATH_SEPARATOR + ENV['RUBYLIB'].to_s
-end
-
-After do
-  ENV['RUBYLIB'] = @original_rubylib
-end

data/lib/dokku_installer_cli.rb

@@ -1,5 +0,0 @@
-require "dokku_installer_cli/version"
-
-module DokkuInstallerCli
-  # Your code goes here...
-end

data/lib/dokku_installer_cli/version.rb

@@ -1,3 +0,0 @@
-module DokkuInstallerCli
-  VERSION = "0.0.2"
-end

data/test/tc_something.rb

@@ -1,7 +0,0 @@
-require 'test/unit'
-
-class TestSomething < Test::Unit::TestCase
-  def test_truth
-    assert true
-  end
-end