AUTHORS generator/move.rb @@ -22,9 +22,9 @@ Gem::Specification.new do |s| s.summary = %q{art_generators provides rails-style generators for managing a digital art project.} s.homepage = %q{http://www.robmyers.org/} s.description = %q{art_generators provides rails-style generators for managing a digital art project.} - s.files = [ "README", "Changelog", "COPYING", "bin/art_project", + s.files = [ "README", "Changelog", "COPYING", "bin/art_project", "generator/project.rb", "generator/release.rb", - "generator/web.rb", "generator/work.rb", + "generator/web.rb", "generator/work.rb", "generator/move.rb", "templates/template.svg"] s.executables = ['art_project'] end \ No newline at end of file art_generators.gemspec @@ -34,10 +34,10 @@ # -v, --version Display version number # -a, --artist Your name # -l, --license Set the Creative Commons license URL for the project -# -g, --git Use the git version control system for the project +# -g, --git URL Use the git version control system for the project +# -s, --svn URL Use the svn version control system for the project # -d, --date The year(s) for the copyright message # -# # == Author # Rob Myers <rob@robmyers.org> # @@ -47,10 +47,11 @@ require 'fileutils' +#require 'liblicense' require 'optparse' require 'ostruct' require 'rdoc/usage' -#require 'liblicense' +require 'yaml' class ArtProject VERSION = "0.0.1" @@ -80,22 +81,31 @@ class ArtProject def initialize_project_details @project = OpenStruct.new @project.name = '' - @project.license_id = '' - @project.license_metadata = '' - @project.license_full_text = '' - @project.dir = '' + @project.unix_name = '' @project.artist = '' + @project.remote_repository = nil @project.use_git = false @project.use_svn = false + @project.license_uri = '' + + # Don't save to the yaml in case the directory is moved by the user + @project_dir = '' + @version_control_dir = '' end def parsed_options? opts = OptionParser.new opts.on('-v', '--version') { output_version ; exit 0 } opts.on('-h', '--help') { output_help } - opts.on("-g", "--git") {|git| @project.use_git << git} - #opts.on("-s", "--svn") {|svn| @project.use_svn << svn} - #opts.on('-l LICENSE', '--license LICENSE') do |license| + opts.on("-g", "--git URI") do |uri| + @project.use_git = true + @project.remote_repository = uri + end + opts.on("-s", "--svn URI") do |uri| + @project.use_svn = true + @project.remote_repository = uri + end + #opts.on('-l LICENSE', '--license URI') do |license| # @project.license_id << license #end opts.on('-a', '--artist') { |artist| @project.artist << artist } @@ -117,20 +127,40 @@ class ArtProject end def arguments_valid? - if @arguments[0] == nil + if @arguments.length != 1 + puts "No project name specified." return false end - #if @project.git && @project.svn - # puts "Both git and svn specified. Please one or the other, not both." - # return false - #end + if @project.use_git && @project.use_svn + puts "Both git and svn specified. Please one or the other, not both." + return false + end + if @project.use_git + if @project.remote_repository.rindex('.git') == nil + puts "git uri must be of the format: ssh://git.com/var/git/project.git" + return false + end + end + if @project.use_svn + if @project.remote_repository.rindex(@project.unix_name) == nil + puts "svn uri must end with project name" + return false + end + end #TODO Check the licence id is valid true end def process_arguments @project.name = @arguments[0] # nil if unsupplied - @project.dir = Dir.pwd + "/" + @project.name + # Make a safe UNIX filename + #TODO: Improve this + @project.unix_name = @project.name.downcase.gsub(/ \//, '_') + @version_control_dir = Dir.pwd + '/' + @project.unix_name + @project_dir = @version_control_dir + if @project.use_svn + @project_dir += '/trunk' + end end def output_help @@ -152,47 +182,83 @@ class ArtProject end def make_directories - if File.exists? @project.dir - die "Cannot create project. Directory named {@project.dir} already exists. Please rename or move the existing directory." + if File.exists? @project_dir + puts "Cannot create project. Directory named #{@project_dir} already exists. Please rename or move the existing directory." + exit 1 end - FileUtils.mkdir_p @project.dir - FileUtils.mkdir_p @project.dir + "/discard" - FileUtils.mkdir_p @project.dir + "/final" - FileUtils.mkdir_p @project.dir + "/preparatory" - FileUtils.mkdir_p @project.dir + "/releases" - FileUtils.mkdir_p @project.dir + "/resources" - FileUtils.mkdir_p @project.dir + "/script" + + FileUtils.mkdir_p @project_dir + + if @project.use_svn + FileUtils.mkdir_p @version_control_dir + '/branches' + FileUtils.mkdir_p @version_control_dir + '/tags' + end + + + FileUtils.mkdir_p @project_dir + "/discard" + FileUtils.mkdir_p @project_dir + "/final" + FileUtils.mkdir_p @project_dir + "/preparatory" + FileUtils.mkdir_p @project_dir + "/releases" + FileUtils.mkdir_p @project_dir + "/resources" + FileUtils.mkdir_p @project_dir + "/script" end def make_script_link(name) - script=@project.dir + "/script/" + name + script="#{@project_dir}/script/#{name}" File.open(script, 'w') {|f| f.puts("#!/usr/bin/env ruby") f.puts("$project_dir=File.dirname(File.dirname(File.expand_path(__FILE__)))") - f.puts("require '" + @generator_dir + "/" + name + ".rb'") + f.puts("require '#{@generator_dir}/#{name}.rb'") File.chmod(0700, script)} end def make_script_links + make_script_link("move") make_script_link("release") make_script_link("web") make_script_link("work") end def make_files - File.open(@project.dir + "/resources/license.xml", 'w') {|f| - f.write(@project.license_metadata) } - File.open(@project.dir + "/COPYING", 'w') {|f| - f.write(@project.license_full_text) } - File.open(@project.dir + "/README", 'w') {|f| - f.write(@project.name + " by " + @project.artist + - ".\nSee COPYING for license.\n") } - FileUtils.cp(@template_dir + "/template.svg", @project.dir + "/resources") + #File.open("#{@project_dir}/resources/license.xml", 'w') {|f| + # f.write(@project.license_metadata) } + File.open("#{@project_dir}/COPYING", 'w') do |f| + f.write("See: ") + f.write(@project.license_uri) + end + File.open("#{@project_dir}/README", 'w') do |f| + f.write("#{@project.name}") + if @project.artist != '' + f.write("by #{@project.artist}\name") + end + f.write("\nSee COPYING for license.\n") + end + FileUtils.cp("#{@template_dir}/template.svg", "#{@project_dir}/resources") + File.open("#{@project_dir}/resources/configuration.yaml", 'w') do |f| + f.write(@project.marshal_dump.to_yaml) + end end def initialize_version_control - Kernel.system('git-init') if @project.use_git - #Kernel.system('svn-init') if @project.use_svn + if @project.use_git + # Need to make sure we cd .. if something fails + File.cd(@version_Control_dir) + Kernel.system('git', 'init') + Kernel.system('git', 'add', '.') + Kernel.system('git', 'commit') + Kernel.system('git', 'remote', 'add', 'origin', + @project.remote_repository) + Kernel.system('git', 'push', 'origin', 'master') + file.cd('..') + end + if @project.use_svn + Kernel.system('svn', 'import', @version_control_dir, + @project.remote_repository, + "-m", "Checkin of generated directory structure.") + FileUtils.remove_entry_secure(@version_control_dir) + Kernel.system('svn', 'checkout', @project.remote_repository, + @project.name) + end end def process_command generator/project.rb @@ -16,6 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. +require 'date' require 'optparse' require 'rdoc/usage' @@ -27,7 +28,7 @@ require 'rdoc/usage' # art_release # # == Usage -# art_release [options] +# release [options] # # For help use: art_project -h # @@ -49,12 +50,12 @@ class ArtRelease def initialize (arguments) @arguments = arguments - @script_dir = File.dirname(File.expand_path(__FILE__)) @project_dir = File.dirname(@script_dir) @project_name = File.basename(@project_dir) @archive_dir = @project_dir + "/archives" @archive_file = '' + @tag = "release_#{Date::today.to_s}" end def run @@ -74,6 +75,9 @@ class ArtRelease opts.on('-f FILENAME', '--file FILENAME') do |file| @archive_file << @archive_dir + file || "#(@archive_dir)/#(@project_name)" end + opt.on('-t TAG', '--tag TAG') do |tag| + @tag = tag + end # This consumes matched arguments from @arguments opts.parse!(@arguments) rescue return false process_options @@ -81,8 +85,8 @@ class ArtRelease end def process_options - if ! (@archive_file.ends_with ".tar.gz" || - @archive_file.ends_with ".tgz") + if ! (@archive_file.index(".tar.gz") != nil) || + (@archive_file.index(".tgz") != nil) @archive_file += "tar.gz" end end @@ -114,8 +118,22 @@ class ArtRelease die "Failed to create archive." end end + + def using_git? + File.exists("#{@project.project_path}/.git") + end + + def using_svn? + File.exists("#{@project.project_path}/.svn") + end + + def tag_release_version + Kernel.system("git' 'tag' @tag) if @project.git + #Kernel.system("svn tag #{tag}") if @project.svn + end def process_command + tag_release_version make_archive end end generator/release.rb @@ -16,10 +16,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -require 'fileutils' -require 'optparse' -require 'rdoc/usage' - # == Synopsis # Copies an existing work (or the project template) to start a new work. # @@ -28,7 +24,7 @@ require 'rdoc/usage' # art_project -c leaves.svg flowers.svg # # == Usage -# art_work [options] work_name +# work [options] work_name # # For help use: art_work -h # @@ -44,6 +40,10 @@ require 'rdoc/usage' # Copyright (C) 2008 Rob Myers. Licensed under the GNU GPL 3 or later. # http://www.gnu.org/licenses/gpl-3.0.html +require 'fileutils' +require 'optparse' +require 'rdoc/usage' + class ArtWork VERSION = "0.0.1" @@ -95,8 +95,12 @@ class ArtWork end def arguments_valid? - @arguments.length == 1 + if @arguments.length != 1 + puts "No work file name specified." + return false + end # And the argument refers to an existing file + return true end def process_arguments @@ -130,16 +134,16 @@ class ArtWork end def add_work_to_version_control - if using_git? - Kernel.system("git add #{@destination_work_name}") - end - if using_svn? - Kernel.system("svn add #{@destination_work_name}") - end + Kernel.system("git add #{@destination_work_name}") if using_git? + Kernel.system("svn add #{@destination_work_name}") if using_svn? end def process_command - if File.exists? @destination_work_name + if ! File.exists?(@source_work_name) + puts "File doesn't exist #{@source_work_name}" + exit 1 + end + if File.exists?(@destination_work_name) puts "File already exists #{@destination_work_name}" exit 1 end generator/work.rb 4302916f80ba9b2beffb121f097ea6f91c19e9f1 Rob Myers rob@robmyers.org http://github.com/robmyers/art_generators/commit/0f0d04946732fed282e0b007717fe787205f9a52 0f0d04946732fed282e0b007717fe787205f9a52 2008-08-31T13:04:26-07:00 2008-08-31T13:04:26-07:00 art_project now works with svn, added move script (not working with svn yet), added AUTHORS. 29c9c84383e52ae2d2dfb0e8c07247ca4a80b62d Rob Myers rob@robmyers.org