Changed drum rolls to be more useful. Added Drum Sticks as a way of doing entrypoint in a semi-clever way. General tidying. Should have committed more often.

2 files changed, 95 insertions, 21 deletions

diff --git a/Readme.textile b/Readme.textile
index da469eb..18e4a6e 100644
--- a/Readme.textile
+++ b/Readme.textile
@@ -25,15 +25,36 @@ p. A Kick Drum is a Bass Drum with your gems installed.
 
 bc. drum kick
 
+h2. Drum Rolls
+
+p. This beats on the Kick Drum with your current directory mounted as a volume. For dev.
+
+bc.. drum roll
+drum roll -- -p123:456
+
 h2. Snare Drums
 
-p. A Snare Drum is a Kick Drum with your application installed.
+p. A Snare Drum is a Kick Drum with your application fully installed, ready for deployment to production.
 
 bc. drum snare
 
-h2. Drum Rolls
+h2. Drum Stick
 
-p. This runs the container.
+p. A Drum Stick is how you beat on the Drum. You needn't actually specify the Drum Stick, drum tries to be clever.
 
-bc.. drum roll
-drum roll -- -p123:456
+h3. Stick selection
+
+p. Drum will try the following sticks in order, and use the first that matches.
+
+# Is there a manually specified stick?
+# Is it a rails app? (Run rails server)
+# Is there an executable file with the same name as the working directory?
+# Is there only one executable .rb file?
+# Is there only one file that looks like "entrypoint"
+# Is there only one executable file?
+
+h3. Manual Stick
+
+bc. drum stick ./example.rb
+drum stick ruby example.rb
+drum stick rails server
diff --git a/drum b/drum
index b939374..bf68158 100755
--- a/drum
+++ b/drum
@@ -6,7 +6,8 @@ require 'tempfile'
 
 OPTIONS = OpenStruct.new({
   noop: false,
-  drumkit: ".drumkit"
+  drumkit: ".drumkit",
+  erase: false
 })
 
 class Drumkit
@@ -24,6 +25,7 @@ class Drumkit
     @bassdrum = nil
     @kickdrum = nil
     @snaredrum = nil
+    @drumstick = nil
 
     lines.each do |line|
       case line
@@ -33,21 +35,20 @@ class Drumkit
         @kickdrum = line[9..-1]
       when /^SNAREDRUM/
         @snaredrum = line[10..-1]
+      when /^DRUMSTICK/
+        @drumstick = line[10..-1].split(" ")
       end
     end
   end
 
-  attr_accessor :bassdrum, :kickdrum, :snaredrum, :drumsticks
-
-  def add_stick(stick)
-    @drumsticks.push(stick)
-  end
+  attr_accessor :bassdrum, :kickdrum, :snaredrum, :drumstick
 
   def to_s
     "This file will be modified automatically. Only make changes if you know what you are doing. Otherwise, use drum.\n\n" +
     (@bassdrum ? "BASSDRUM #{@bassdrum}\n" : "") +
     (@kickdrum ? "KICKDRUM #{@kickdrum}\n" : "") +
-    (@snaredrum ? "SNAREDRUM #{@snaredrum}\n" : "")
+    (@snaredrum ? "SNAREDRUM #{@snaredrum}\n" : "") +
+    (@drumstick ? "DRUMSTICK #{@drumstick.join(" ")}\n" : "")
   end
 end
 
@@ -65,8 +66,29 @@ def error(str, rc = nil)
   exit rc unless rc.nil?
 end
 
-def entrypoint
-  "./#{File.basename(Dir.pwd)}.rb"
+def entrypoint(dk)
+  #0. Is there a stick specified?
+  return dk.drumstick unless dk.drumstick.nil?
+
+  files = Dir.entries(Dir.pwd)
+  #1. Is it a rails app?
+  return ["rails", "server"] if File.exists?("Gemfile") && File.read("Gemfile").downcase =~ /gem "rails"/
+  #2. Is there an executable file with the same name as the working dir?
+  d = File.basename(Dir.pwd)
+  r = /#{d}(\.rb)?/
+  s = files.select{|f|f =~ r}
+  return ["./#{s[0]}"] if s.length == 1 && File.executable?(s[0])
+  #3. Is there only one ruby file?
+  d = /\.rb/
+  s = files.select{|f|f =~ d}
+  return ["./#{s[0]}"] if s.length == 1 && File.executable?(s[0])
+  #4. Is there a file that looks like "entrypoint"
+  r = /entrypoint/
+  s = files.select{|f|f =~ r}.select{|f|File.executable?(f)}
+  return ["./#{s[0]}"] if s.length == 1
+  #5. Is there only one executable file?
+  s = files.select{|f|File.executable?(f)}
+  return ["./#{s[0]}"] if s.length == 1
 end
 
 parser = OptionParser.new do |opt|
@@ -78,6 +100,9 @@ parser = OptionParser.new do |opt|
   opt.on("-d", "--drumkit", :REQUIRED, "Specify drumkit file (default: .drumkit)") do |dk|
     OPTIONS.drumkit = dk
   end
+  opt.on("--erase", "Erase this drum from the drumkit.") do
+    OPTIONS.erase = true
+  end
   opt.on("-h", "--help", "Print usage") do
     help opt
     exit 0
@@ -94,9 +119,29 @@ else
   DRUMKIT = Drumkit.new
 end
 
+if OPTIONS.erase
+  case COMMAND
+    when nil
+      error("No key given to erase", 1)
+    when "bass"
+      DRUMKIT.bassdrum = nil
+    when "kick"
+      DRUMKIT.kickdrum = nil
+    when "snare"
+      DRUMKIT.snaredrum = nil
+    when "stick"
+      DRUMKIT.drumstick = nil
+    else
+      error("Invalid key: \"#{COMMAND}\"", 1)
+  end
+  File.open(OPTIONS.drumkit, "w").puts(DRUMKIT.to_s)
+  info("Key \"#{COMMAND}\" erased")
+  exit 0
+end
+
 case COMMAND
   when nil
-    error "Error: No command given\n\n"
+    error "No command given\n\n"
     help parser
     exit 1
   when "bass"
@@ -132,32 +177,40 @@ case COMMAND
     puts "Building Kick Drum: #{kickdrum}" if OPTIONS.noop
     Tempfile.open("drum-tmp-dockerfile", Dir.pwd) do |f|
       f.puts "FROM #{DRUMKIT.bassdrum}"
+      f.puts "WORKDIR /opt"
       f.puts "COPY Gemfile* ./"
-      f.puts "RUN bundle install"
+      f.puts "RUN [\"bundle\", \"install\"]"
       f.flush
       system "docker build -t #{kickdrum} -f #{File.basename(f)} ."
-      system "docker run #{kickdrum} cat Gemfile.lock > Gemfile.lock"
+      system "docker run --rm #{kickdrum} cat Gemfile.lock > Gemfile.lock"
     end unless OPTIONS.noop
     DRUMKIT.kickdrum = kickdrum unless OPTIONS.noop
   when "snare"
     error("No Kick Drum specified.", 1) if DRUMKIT.kickdrum.nil?
     if DRUMKIT.snaredrum.nil?
-      snaredrum = "#{DRUMKIT.kickdrum}-snare-#{entrypoint.gsub(/[\/.]/, "_")}"
+      snaredrum = "#{DRUMKIT.kickdrum}-snare-#{entrypoint(DRUMKIT).join('_').gsub(/[\/.]/, "_").gsub(/(^[-_.]+|[-_.]+$)/, "")}"
     else
       snaredrum = DRUMKIT.snaredrum
     end
     puts "Creating Snare Drum: #{snaredrum}" if OPTIONS.noop
     Tempfile.open("drum-tmp-dockerfile", Dir.pwd) do |f|
       f.puts "FROM #{DRUMKIT.kickdrum}"
+      f.puts "WORKDIR /opt"
       f.puts "COPY . ."
-      f.puts "ENTRYPOINT [\"#{entrypoint}\"]"
+      f.puts "ENTRYPOINT [\"#{entrypoint(DRUMKIT).join("\", \"")}\"]"
       f.flush
       system "docker build -t #{snaredrum} -f #{File.basename(f)} ."
     end unless OPTIONS.noop
     DRUMKIT.snaredrum = snaredrum unless OPTIONS.noop
   when "roll"
-    error("No Snare Drum specified.", 1) if DRUMKIT.snaredrum.nil?
-    system "docker run #{ARGV.join(" ")} #{DRUMKIT.snaredrum}"
+    error("No Kick Drum specified.", 1) if DRUMKIT.kickdrum.nil?
+    system "docker run --rm -v `pwd`:/opt -w /opt #{ARGV.join(" ")} #{DRUMKIT.kickdrum} #{entrypoint(DRUMKIT).join(" ")}"
+  when "stick"
+    if ARGV[0].nil?
+      puts entrypoint(DRUMKIT).join(" ")
+    else
+      DRUMKIT.drumstick = ARGV unless OPTIONS.noop
+    end
 end
 
 File.open(OPTIONS.drumkit, "w").puts(DRUMKIT.to_s)