cryptopunks 3.0.1 → 2024.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 132182e7092509bbfb860a86685a816699ad83837540655610704621502df32b
-  data.tar.gz: 29852afd5567f7779ff8c9a0b1c9cadc806a4742b1e1640bfa38fc75a7dd2d70
+  metadata.gz: 1fc2a706ce8c4e9ec5947d4bde3a88b4529b1d3af04b092a71de20bbdd28bca6
+  data.tar.gz: 03f0600b6564f8d1d25fccf624adca0bd38b38c52754135aae9dd8b04d63e4b4
 SHA512:
-  metadata.gz: 4be03f0828b4b7cea13d040035121879d02ca0b486784f7980a75d2e7d7876ab89ad19f315da6cb049807621a37ccc3a964b6c145b4e8d0de76cf1633006abea
-  data.tar.gz: a30363a0a877e4bc33b124befd12189cfc92d00cc963a259b1e9c47c726dc1aa528f9696c77ed3a3b8b7b96fa08a1e3c3d02eaecd3e56b04892d552a14da4477
+  metadata.gz: dced1456b9cb0755cc9ec34c8efede1c6d355ce93ff2b295b0dec2b354f6e0d982ec7390e2a1823377cf6f551519e14786507a24d59b8a297c5d8c80ecedd2b0
+  data.tar.gz: '088061933c9355d88ea903fbc6e679b938d8cce1b4176919ffda66cc750efb53f300bac149bc42c9214934e617d8378d124e491be960aec1d338f6ed0a92ee0c'

data/Manifest.txt

@@ -7,12 +7,8 @@ bin/punk
 lib/cryptopunks.rb
 lib/cryptopunks/attributes.rb
 lib/cryptopunks/colors.rb
-lib/cryptopunks/composite.rb
 lib/cryptopunks/contract/punksdata-assets.rb
 lib/cryptopunks/contract/punksdata-contract.rb
 lib/cryptopunks/contract/punksdata-meta.rb
-lib/cryptopunks/dataset.rb
-lib/cryptopunks/image.rb
-lib/cryptopunks/structs.rb
 lib/cryptopunks/tool.rb
 lib/cryptopunks/version.rb

data/README.md

@@ -33,7 +33,7 @@
 
 # Crypto Punks
 
-cryptopunks - generate your own 24×24 pixel punk images (off-chain) from the True Official Matt & John's® Punks sha256-verified original 10 000 unique character collection; incl. 2x/4x/8x zoom for bigger sizes
+cryptopunks - generate your own 24×24 pixel punk images from text prompts incl. 2x/4x/8x zoom for bigger sizes  (or crop 'n' save tiles from all-in-one composites incl. the True Official Matt & John's® Punks sha256-verified original 10 000 unique character collection)  
 
 * home  :: [github.com/cryptopunksnotdead/cryptopunks](https://github.com/cryptopunksnotdead/cryptopunks)
 * bugs  :: [github.com/cryptopunksnotdead/cryptopunks/issues](https://github.com/cryptopunksnotdead/cryptopunks/issues)
@@ -67,24 +67,23 @@ VERSION
     3.0.0
 
 GLOBAL OPTIONS
-    -d, --dir,
-    -o, --out, --outdir=DIR - Output directory (default: .)
-    -f, --file=FILE         - All-in-one
-                              composite image (default: ./punks.png)
-    --offset=NUM            - Start counting at offset (default: 0)
-    --seed=NUM              - Seed for random number generation /
-                              shuffle (default: 4142)
-    -z, --zoom=ZOOM         - Zoom factor x2, x4, x8, etc. (default: 1)
+    -o, --out, --dir, --outdir=DIR - Output directory (default: .)
+    -f, --file=FILE                - All-in-one
+                                     composite image (default: ./punks.png)
+    --offset=NUM                   - Start counting at offset (default: 0)
+    --seed=NUM                     - Seed for random number generation /
+                                     shuffle (default: 4142)
+    -z, --zoom=NUM                 - Zoom factor x2, x4, x8, etc. (default: 1)
 
-    --help                  - Show this message
-    --version               - Display the program version
-    --verbose               - (Debug) Show debug messages
+    --help                         - Show this message
+    --version                      - Display the program version
+    --verbose                      - (Debug) Show debug messages
 
 
 COMMANDS
-    g, gen, generate - Generate punk characters from text attributes (from
+    g, gen,          - Generate punk characters from text attributes (from
                        scratch / zero) via builtin punk spritesheet
-    l, ls, list      - List all punk archetype and attribute names from builtin
+    l, ls            - List all punk archetype and attribute names from builtin
                        punk spritesheet
     q, query         - Query (builtin off-chain) punk contract for punk text
                        attributes by IDs - use 0 to 9999
@@ -107,7 +106,7 @@ _Generate punk characters from text attributes (from scratch / zero) via builtin
 Let's try punk #0:
 
 ```
-$ punk generate female_2 earring blonde_bob green_eye_shadow
+$ punk gen female_2 earring blonde_bob green_eye_shadow
 ```
 
 resulting in:
@@ -117,9 +116,9 @@ resulting in:
 Let's try  the `-z/--zoom` factor 2x, 4x, 8x, etc.:
 
 ```
-$ punk --zoom 4 generate female_2 earring blonde_bob green_eye_shadow
+$ punk --zoom=4 gen female_2 earring blonde_bob green_eye_shadow
 # -or-
-$ punk -z2 g female_2 earring blonde_bob green_eye_shadow
+$ punk -z4 g female_2 earring blonde_bob green_eye_shadow
 ```
 
 resulting in:
@@ -132,8 +131,8 @@ resulting in:
 Let's try never-before-seen super-rare punks:
 
 ```
-$ punk generate demon heart_shades
-$ punk generate vampire_female wild_hair
+$ punk gen demon heart_shades
+$ punk gen vampire_female wild_hair
 ```
 
 resulting in:
@@ -156,9 +155,9 @@ _List all punk archetype and attribute names from builtin punk spritesheet_
 Let's try:
 
 ```
-$ punk list
-# -or-
 $ punk ls
+# -or-
+$ punk l
 ```
 
 resulting in:
@@ -391,7 +390,7 @@ And voila!
 Let's give it a try.  Let's save punk #0, #2890, and #8219 in 2x format:
 
 ```
-$ punk --zoom 2 tile 0 2890 8219
+$ punk --zoom=2 tile 0 2890 8219
 # -or-
 $ punk -z2 t 0 2890 8219
 ```
@@ -456,7 +455,7 @@ and let's add an offset of 10000
 (to start counting at 10000 instead of 0):
 
 ```
-$ punk --file ./more-punks-1.png --offset 10000 tile 0 18 40 88
+$ punk --file=./more-punks-1.png --offset=10000 tile 0 18 40 88
 ```
 
 printing:
@@ -500,7 +499,7 @@ and let's add an offset of 10100
 (to start counting at 10000 plus 100 instead of 0):
 
 ```
-$ punk --file ./more-punks-2.png --offset 10100 tile 0 79 80 90
+$ punk --file=./more-punks-2.png --offset=10100 tile 0 79 80 90
 ```
 
 printing:
@@ -550,7 +549,7 @@ all punks. Phree the phunks! Let's give it a try:
 ```
 $ punk flip
 #  - same as -
-$ punk --file ./punks.png flip
+$ punk --file=./punks.png flip
 ```
 
 printing:
@@ -571,7 +570,7 @@ Yes, you can.  Use any all-in-one composite image in the 24x24 format. Use the `
 Example - let's flip the 1000 More Punks collection:
 
 ```
-$ punk --file ./morepunks.png flip
+$ punk --file=./morepunks.png flip
 ```
 
 And so on.
@@ -590,7 +589,7 @@ Let's give it a try:
 ```
 $ punk shuffle
 #  - same as -
-$ punk --file ./punks.png --seed 4142 shuffle
+$ punk --file=./punks.png --seed=4142 shuffle
 ```
 
 printing:
@@ -630,7 +629,7 @@ Yes, you can.  Use any all-in-one composite image in the 24x24 format. Use the `
 Example - let's shuffle the 1000 More Punks collection:
 
 ```
-$ punk --file ./morepunks.png shuffle
+$ punk --file=./morepunks.png shuffle
 ```
 
 And so on.
@@ -663,4 +662,9 @@ Use it as you please with no restrictions whatsoever.
 
 ## Questions? Comments?
 
-Post them on the [D.I.Y. Punk (Pixel) Art reddit](https://old.reddit.com/r/DIYPunkArt). Thanks.
+Join us in the [Punk Art discord (chat server)]( https://discord.gg/FE3HeXNKRa). Yes you can.
+Your questions and commentary welcome.
+
+
+Or post them over at the [Help & Support](https://github.com/geraldb/help) page. Thanks.
+

data/Rakefile

@@ -13,7 +13,7 @@ Hoe.spec 'cryptopunks' do
 
   self.version = Pixelart::Module::Cryptopunks::VERSION
 
-  self.summary = "cryptopunks - generate your own 24×24 pixel punk images (off-chain) from the Official Genuine Matt & John's® Punks sha256-verified original 10 000 unique character collection; incl. 2x/4x/8x zoom for bigger sizes"
+  self.summary = "cryptopunks - generate your own 24×24 pixel punk images from text prompts incl. 2x/4x/8x zoom for bigger sizes  (or crop 'n' save tiles from all-in-one composites incl. the True Official Matt & John's® Punks sha256-verified original 10 000 unique character collection)"
   self.description = summary
 
   self.urls    = { home: 'https://github.com/cryptopunksnotdead/cryptopunks' }
@@ -27,8 +27,8 @@ Hoe.spec 'cryptopunks' do
 
   self.extra_deps = [
     ['pixelart', '>= 1.3.2'],
-    ['punks', '>= 0.2.0'],
-    ['gli'],
+    ['punks', '>= 2024.2.29'],
+    ['cmdparse'],
   ]
 
   self.licenses = ['Public Domain']

data/lib/cryptopunks/tool.rb

@@ -1,127 +1,112 @@
 
 module Punk
 
-
 class Tool
-  def run( args )
-    Toolii.run( args )
-  end
-end
-
-
-
-class Opts
-  def merge_gli_options!( options = {} )
-    # puts "  update options:"
-    # puts options.inspect
-
-    @file     = options[:file]      if options[:file]
-    @outdir   = options[:dir]       if options[:dir]
-
-    @zoom     = options[:zoom]      if options[:zoom]
-    @offset   = options[:offset]    if options[:offset]
-
-    @seed     = options[:seed]      if options[:seed]
-
-    @verbose = true     if options[:verbose] == true
-  end
-
-
-  def verbose=(boolean)   # add: alias for debug ??
-    @verbose = boolean
-  end
-
-  def verbose?
-    return false if @verbose.nil?   # default verbose/debug flag is false
-    @verbose == true
-  end
-
-  def file()    @file || './punks.png';  end
-  def file?()   @file;  end    ## note: let's you check if file is set (or "untouched")
-
-  def zoom()    @zoom || 1; end
-  def zoom?()   @zoom;  end
-
-  def offset()  @offset || 0; end
-  def offset?() @offset;  end
-
-  def outdir()  @outdir || '.'; end
-  def outdir?() @outdir;  end
-
-  ### use a standard (default) seed - why? why not?
-  def seed()  @seed || 4142; end
-  def seed?() @seed;  end
-
-
-
-end # class Opts
-
-
-
-## note: use gli "dsl" inside a class / namespace
-class Toolii
-   extend GLI::App
-
-   opts = Opts.new
-
-
-program_desc 'punk (or cryptopunk) command line tool'
-
-version Pixelart::Module::Cryptopunks::VERSION
-
-
-desc "Zoom factor x2, x4, x8, etc."
-arg_name 'ZOOM'
-default_value opts.zoom
-flag [:z, :zoom], type: Integer
-
-desc "Start counting at offset"
-arg_name 'NUM'
-default_value opts.offset
-flag [:offset], type: Integer
-
-
-desc "Seed for random number generation / shuffle"
-arg_name 'NUM'
-default_value opts.seed
-flag [:seed], type: Integer
-
-
-
-desc "Output directory"
-arg_name 'DIR'
-default_value opts.outdir
-flag [:d, :dir,
-      :o, :out, :outdir], type: String
-
-
-### todo/check: move option to -t/--tile command only - why? why not?
-# desc "True Official Genuine CryptoPunks™ all-in-one composite image"
-desc "All-in-one composite image"
-arg_name 'FILE'
-default_value opts.file
-flag [:f, :file], type: String
-
-
-
-### global option (required)
-## todo: add check that path is valid?? possible?
-desc '(Debug) Show debug messages'
-switch [:verbose], negatable: false    ## todo: use -w for short form? check ruby interpreter if in use too?
 
+  class Opts  ## use nested Opts class (inside Tool) - why? why not?
+    def verbose=(boolean)   # add: alias for debug ??
+      @verbose = boolean
+    end
+  
+    def verbose?
+      return false if @verbose.nil?   # default verbose/debug flag is false
+      @verbose == true
+    end
+  
+    def file()    @file || './punks.png';  end
+    def file?()   @file;  end    ## note: let's you check if file is set (or "untouched")
+    def file=(file) @file = file; end
+  
+    def zoom()    @zoom || 1; end
+    def zoom?()   @zoom;  end
+    def zoom=(num) @zoom = num; end
+  
+    def offset()  @offset || 0; end
+    def offset?() @offset;  end
+    def offset=(num) @offset = num; end
+  
+    def outdir()  @outdir || '.'; end
+    def outdir?() @outdir;  end
+    def outdir=(dir) @outdir = dir;  end
+  
+    ### use a standard (default) seed - why? why not?
+    def seed()  @seed || 4142; end
+    def seed?() @seed;  end
+    def seed=(num) @seed = num; end
+  end # class Opts
+    
+
+##  use def self.run instead of run  e.g.
+##           Tool.run( ARGV ) vs Tool.new.run( ARGV )  
+def run( args )  
+opts = Opts.new
+
+parser = CmdParse::CommandParser.new(handle_exceptions: :no_help)
+parser.main_options.program_name = 'punk'
+parser.main_options.banner = 'punk (or cryptopunk) command line tool'
+parser.main_options.version = Pixelart::Module::Cryptopunks::VERSION
+
+
+
+parser.global_options do |opt|
+      opt.on( '-z', '--zoom=NUM', Integer, 
+              "Zoom factor x2, x4, x8, etc. (default: #{opts.zoom})" 
+            ) do |num|
+             opts.zoom = num
+            end
+
+      opt.on( '--offset=NUM', Integer, 
+              "Start counting at offset (default: #{opts.offset})"   
+            ) do |num|
+              opts.offset = num
+            end     
+
+      ## todo - move to shuffle (only used by shuffle) - why? why not?      
+      opt.on( '--seed=NUM', Integer,
+              "Seed for random number generation / shuffle (default: #{opts.seed})"
+            ) do |num|
+              opts.seed = num
+            end
+
+      # note: remove -d alias (and --dir=DIR)  why? why not?
+      opt.on(  '-o', '--out=DIR', '--dir=DIR', '--outdir=DIR', 
+               "Output directory (default: #{opts.outdir})"
+            ) do |dir|
+               opts.outdir = dir
+            end 
+
+      ### todo/check: move option to -t/--tile command only - why? why not?
+      # desc "True Official Genuine CryptoPunks™ all-in-one composite image"
+      ## todo: add check that path is valid?? possible?
+      opt.on( '-f', '--file=FILE', 
+              "All-in-one composite image (default: #{opts.file})"
+            ) do |file|
+              opts.file = file 
+            end            
+
+      # note - not used for now - always on
+      ## todo: use -w for short form? check ruby interpreter if in use too?      
+      # opt.on( '--verbose',
+      #         "(Debug) Show debug messages" 
+      #      ) do 
+      #          opts.verbose = true
+      #           #     ## LogUtils::Logger.root.level = :debug
+      #        end
+end
 
 
-desc "Flip (vertically) all punk characters in all-in-one punk series composite (#{opts.file})"
-command [:f, :flip] do |c|
-  c.action do |g,o,args|
+# command - f, flip 
+flip = CmdParse::Command.new('flip', takes_commands: false)
+flip.short_desc( "Flip (vertically) all punk characters in all-in-one punk series composite (#{opts.file})" )
+flip.action do
     puts "==> reading >#{opts.file}<..."
     punks = ImageComposite.read( opts.file )
 
     ## note: for now always assume 24x24
-    cols = punks.width / 24
-    rows = punks.height / 24
     tile_width = 24
     tile_height = 24
+    cols = punks.width / tile_width
+    rows = punks.height / tile_height
 
     phunks = ImageComposite.new( cols, rows,
                                  width: tile_width,
@@ -134,28 +119,28 @@ command [:f, :flip] do |c|
     ## make sure outdir exits (default is current working dir e.g. .)
     FileUtils.mkdir_p( opts.outdir )  unless Dir.exist?( opts.outdir )
 
-    ## note: allways assume .png extension for now
+    ## note: always assume .png extension for now
     basename = File.basename( opts.file, File.extname( opts.file ) )
     path  = "#{opts.outdir}/#{basename}-flipped.png"
     puts "==> saving phunks flipped one-by-one by hand to >#{path}<..."
 
     phunks.save( path )
     puts 'Done.'
-  end # action
-end # command flip
+end # action
 
 
-desc "Shuffle all punk characters (randomly) in all-in-one punk series composite (#{opts.file})"
-command [:s, :shuffle] do |c|
-  c.action do |g,o,args|
+# command - s, shuffle
+shuffle = CmdParse::Command.new('shuffle', takes_commands: false)
+shuffle.short_desc( "Shuffle all punk characters (randomly) in all-in-one punk series composite (#{opts.file})" )
+shuffle.action do 
     puts "==> reading >#{opts.file}<..."
     punks = ImageComposite.read( opts.file )
 
     ## note: for now always assume 24x24
-    cols  = punks.width / 24
-    rows  = punks.height / 24
     tile_width = 24
     tile_height = 24
+    cols = punks.width / tile_width
+    rows = punks.height / tile_height
 
     phunks = ImageComposite.new( cols, rows,
                                  width: tile_width,
@@ -171,7 +156,6 @@ command [:s, :shuffle] do |c|
     # seed 4142 ends in [..., 7566, 828, 8987, 9777]
     #       333 ends in [..., 6067, 9635, 973, 8172]
 
-
     indexes.each_with_index do |old_index,new_index|
        puts "    ##{old_index} now ##{new_index}"
        phunks << punks[old_index]
@@ -190,26 +174,16 @@ command [:s, :shuffle] do |c|
 
     phunks.save( path )
     puts 'Done.'
-  end # action
-end # command shuffle
-
-
-
-
+end # action
 
 
-
-desc "Get punk characters via image tiles from all-in-one punk series composite (#{opts.file}) - for IDs use 0 to 9999"
-command [:t, :tile] do |c|
-  c.action do |g,o,args|
-
-    # puts "opts:"
-    # puts opts.inspect
-
+# command - t, tile
+tile = CmdParse::Command.new('tile', takes_commands: false)
+tile.short_desc( "Get punk characters via image tiles from all-in-one punk series composite (#{opts.file}) - for IDs use 0 to 9999" )
+tile.action do |*args|
     puts "==> reading >#{opts.file}<..."
     punks = ImageComposite.read( opts.file )
 
-
     puts "    setting zoom to #{opts.zoom}x"   if opts.zoom != 1
 
     ## make sure outdir exits (default is current working dir e.g. .)
@@ -234,17 +208,16 @@ command [:t, :tile] do |c|
       punk.save( path )
     end
     puts 'Done.'
-  end # action
-end # command tile
+end # action
 
 
-
-desc 'Generate punk characters from text attributes (from scratch / zero) via builtin punk spritesheet'
-command [:g, :gen, :generate] do |c|
-  c.action do |g,o,args|
-
+# command - g, gen, generate
+#   note: shorten to gen
+generate = CmdParse::Command.new('gen', takes_commands: false)
+generate.short_desc( "Generate punk characters from text attributes (from scratch / zero) via builtin punk spritesheet" )
+generate.action do |*args|
     puts "==> generating  >#{args.join( ' + ' )}<..."
-    punk = Image.generate( *args )
+    punk = Punk::Image.generate( *args )
 
     puts "    setting zoom to #{opts.zoom}x"   if opts.zoom != 1
 
@@ -265,17 +238,14 @@ command [:g, :gen, :generate] do |c|
 
     punk.save( path )
     puts 'Done.'
-  end # action
-end # command generate
-
+end # action
 
-desc 'Query (builtin off-chain) punk contract for punk text attributes by IDs - use 0 to 9999'
-command [:q, :query] do |c|
-  c.action do |g,o,args|
 
-    # puts "opts:"
-    # puts opts.inspect
 
+# command - q, query
+query = CmdParse::Command.new('query', takes_commands: false)
+query.short_desc( "Query (builtin off-chain) punk contract for punk text attributes by IDs - use 0 to 9999" )
+query.action do |*args|
     args.each_with_index do |arg,index|
       punk_index = arg.to_i( 10 )  ## assume base 10 decimal
 
@@ -292,19 +262,20 @@ command [:q, :query] do |c|
       print "\n"
     end
     puts 'Done.'
-  end
 end
 
 
-
-desc 'List all punk archetype and attribute names from builtin punk spritesheet'
-command [:l, :ls, :list] do |c|
-  c.action do |g,o,args|
-
-    generator = Image.generator
+# command - l, ls    # (NOT) list 
+##  note: ls (alias) is NOT possible with cmdparse gem!!!!! - ask if workaround?
+##   note: as a workaround use ls for now (not list)!!!
+list = CmdParse::Command.new('ls', takes_commands: false)
+list.short_desc( "List all punk archetype and attribute names from builtin punk spritesheet" )
+list.action do 
+    # was: generator = Punk::Image.generator
+    sheet = Punk::Spritesheet.builtin
 
     puts "==> Archetypes"
-    generator.meta.each do |rec|
+    sheet.meta.each do |rec|
       next unless rec.archetype?
 
       print "  "
@@ -315,7 +286,7 @@ command [:l, :ls, :list] do |c|
 
     puts ""
     puts "==> Attributes"
-    generator.meta.each do |rec|
+    sheet.meta.each do |rec|
       next unless rec.attribute?
 
       print "  "
@@ -325,58 +296,27 @@ command [:l, :ls, :list] do |c|
     end
 
     puts ""
-    puts "  See github.com/cryptopunksnotdead/punks.spritesheet for more."
+    puts "  See github.com/openpunkart/punkart.spritesheet for more."
     puts ""
 
     puts 'Done.'
-  end # action
-end # command list
+end # action
 
 
+parser.add_command(CmdParse::HelpCommand.new, default: true)
+parser.add_command(CmdParse::VersionCommand.new)
+parser.add_command( flip )
+parser.add_command( shuffle )
+parser.add_command( tile )
+parser.add_command( generate )
+parser.add_command( query )
+parser.add_command( list )
 
-pre do |g,c,o,args|
-  opts.merge_gli_options!( g )
-  opts.merge_gli_options!( o )
-
-  if opts.verbose?
-    ## LogUtils::Logger.root.level = :debug
-  end
-
-  ## logger.debug "Executing #{c.name}"
-  true
-end
-
-post do |global,c,o,args|
-  ## logger.debug "Executed #{c.name}"
-  true
-end
-
-
-on_error do |e|
-
-  if opts.verbose?
-    puts e.backtrace
-  end
-
-  if e.is_a?( SystemExit )
-     puts
-     puts "*** error: system exit with status code ( #{e.status} )"
-     exit( e.status )   ## try exit again to make sure error code gets passed along!!!
-  else
-    puts
-    puts "*** error: #{e.message}"
-  end
-
-  ## note: was false    # skip default error handling
-
-  ## note: try true - false WILL SWALLOW exit codes and such
-  ##  - looks like it's still returning 0 (e.g. on unknown option or such)!!!!
-  true
-end
 
+parser.parse( args )
+end  # method run
+end  # class Tool
+end  # moduule Punk
 
-### exit run(ARGV)  ## note: use Toolii.run( ARGV ) outside of class
-end   # class Toolii
-end # module Punk
 
 

data/lib/cryptopunks/version.rb

@@ -4,9 +4,9 @@ module Pixelart
 module Module
 module Cryptopunks
 
-  MAJOR = 3
-  MINOR = 0
-  PATCH = 1
+  MAJOR = 2024
+  MINOR = 3
+  PATCH = 2
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version

data/lib/cryptopunks.rb

@@ -6,7 +6,7 @@ require 'punks'
 ## extra stdlibs
 require 'digest'     ## move/add to pixelart upstream - why? why not?
 require 'optparse'
-require 'gli'        ## used for command line tool
+require 'cmdparse'        ## used for command line tool
 
 
 
@@ -15,23 +15,7 @@ require 'cryptopunks/version'    # note: let version always go first
 
 
 require 'cryptopunks/attributes'
-require 'cryptopunks/structs'
-require 'cryptopunks/composite'
-
-
-## add old backwards compatible alias
-module Punk
-   class Image
-      Composite = ImageComposite
-   end
-end
-
-
-
-require 'cryptopunks/dataset'
-
 require 'cryptopunks/colors'
-require 'cryptopunks/image'
 
 
 ####

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cryptopunks
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 2024.3.2
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-11 00:00:00.000000000 Z
+date: 2024-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pixelart
@@ -30,16 +30,16 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 2024.2.29
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 2024.2.29
 - !ruby/object:Gem::Dependency
-  name: gli
+  name: cmdparse
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -78,17 +78,18 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.23'
+        version: '4.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.23'
-description: cryptopunks - generate your own 24×24 pixel punk images (off-chain) from
-  the Official Genuine Matt & John's® Punks sha256-verified original 10 000 unique
-  character collection; incl. 2x/4x/8x zoom for bigger sizes
+        version: '4.1'
+description: cryptopunks - generate your own 24×24 pixel punk images from text prompts
+  incl. 2x/4x/8x zoom for bigger sizes  (or crop 'n' save tiles from all-in-one composites
+  incl. the True Official Matt & John's® Punks sha256-verified original 10 000 unique
+  character collection)
 email: wwwmake@googlegroups.com
 executables:
 - cryptopunk
@@ -108,13 +109,9 @@ files:
 - lib/cryptopunks.rb
 - lib/cryptopunks/attributes.rb
 - lib/cryptopunks/colors.rb
-- lib/cryptopunks/composite.rb
 - lib/cryptopunks/contract/punksdata-assets.rb
 - lib/cryptopunks/contract/punksdata-contract.rb
 - lib/cryptopunks/contract/punksdata-meta.rb
-- lib/cryptopunks/dataset.rb
-- lib/cryptopunks/image.rb
-- lib/cryptopunks/structs.rb
 - lib/cryptopunks/tool.rb
 - lib/cryptopunks/version.rb
 homepage: https://github.com/cryptopunksnotdead/cryptopunks
@@ -138,10 +135,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
-summary: cryptopunks - generate your own 24×24 pixel punk images (off-chain) from
-  the Official Genuine Matt & John's® Punks sha256-verified original 10 000 unique
-  character collection; incl. 2x/4x/8x zoom for bigger sizes
+summary: cryptopunks - generate your own 24×24 pixel punk images from text prompts
+  incl. 2x/4x/8x zoom for bigger sizes  (or crop 'n' save tiles from all-in-one composites
+  incl. the True Official Matt & John's® Punks sha256-verified original 10 000 unique
+  character collection)
 test_files: []

data/lib/cryptopunks/composite.rb

@@ -1,38 +0,0 @@
-module Punk
-   ## note: was Image::Composite
-  class ImageComposite  < Pixelart::ImageComposite
-
-    PUNK_HASH   = 'ac39af4793119ee46bbff351d8cb6b5f23da60222126add4268e261199a2921b'
-
-    def self.sha256( data )
-      ## todo/check: or just use Digest::SHA256.hexdigest - why? why not?
-      Digest::SHA256.digest( data ).unpack( 'H*' )[0]
-    end
-
-
-    PUNK_HEIGHT = 24
-    PUNK_WIDTH  = 24
-
-    def self.read( path='./punks.png', width: PUNK_WIDTH, height: PUNK_HEIGHT )
-      data = File.open( path, 'rb' ) { |f| f.read }
-
-      hexdigest = sha256( data )   ## check sha256 checksum
-      if hexdigest == PUNK_HASH
-         puts "     >#{hexdigest}< SHA256 hash matching"
-         puts "         ✓ True Official Genuine Matt & John's® Punks verified"
-      else
-         puts "         ✓ True Official Genuine Yes, You Can! Punk's Not Dead® verified"
-      end
-
-      img = ChunkyPNG::Image.from_blob( data )
-      new( img, width: width, height: height )
-    end
-
-
-    def initialize( *args, width:  PUNK_WIDTH,
-                           height: PUNK_HEIGHT )
-      super
-    end
-
-  end ## class ImageComposite
-end ## module Punk

data/lib/cryptopunks/dataset.rb

@@ -1,67 +0,0 @@
-
-
-module Punk
-  module Dataset
-
-    def self.read( path='./datasets/punks/*.csv' )
-
-      datasets = Dir.glob( path )
-      #=> ["./datasets/punks/0-999.csv",
-      #    "./datasets/punks/1000-1999.csv",
-      #    "./datasets/punks/2000-2999.csv",
-      #    "./datasets/punks/3000-3999.csv",
-      #    "./datasets/punks/4000-4999.csv",
-      #    "./datasets/punks/5000-5999.csv",
-      #    "./datasets/punks/6000-6999.csv",
-      #    "./datasets/punks/7000-7999.csv",
-      #    "./datasets/punks/8000-8999.csv",
-      #    "./datasets/punks/9000-9999.csv"]
-
-      rows = []
-      datasets.each do |dataset|
-        rows += CsvHash.read( dataset )
-      end
-
-      # puts "  #{rows.size} rows(s)"
-      #=> 10000 rows(s)
-
-      ### wrap in punk struct for easier access
-      punks = []
-      rows.each do |row|
-        id            = row['id'].to_i
-        type_q        = row['type']
-        count         = row['count'].to_i
-        accessories_q = row['accessories'].split( %r{[ ]*/[ ]*} )
-
-        if count != accessories_q.size
-          puts "!! ERROR - punk data assertion failed - expected accessories count #{count}; got #{accessories_q.size}"
-          pp row
-          exit 1
-        end
-
-        type = Metadata::Type.find( type_q )
-        if type.nil?
-          puts "!! ERROR - punk data assertion failed - unknown punk type >#{type_q}<"
-          pp row
-          exit 1
-        end
-
-        accessories = []
-        accessories_q.each do |acc_q|
-          acc = Metadata::Accessory.find( acc_q )
-          if acc.nil?
-            puts "!! ERROR - punk data assertion failed - unknown punk accessory type >#{acc_q}<"
-            pp row
-            exit 1
-          end
-          accessories << acc
-        end
-
-        punks << Metadata.new( id, type, accessories )
-      end
-      punks
-    end
-  end  # module Dataset
-end  # module Punk
-
-

data/lib/cryptopunks/image.rb

@@ -1,35 +0,0 @@
-module Punk
-
-
-
-class Image
-
-def self.read( path )   ## convenience helper
-  img = ChunkyPNG::Image.from_file( path )
-  new( img )
-end
-
-
-
-=begin
-
-### keep design & colors keyword args in c'tor here
-##     or use parse() like in pixelart - why? why not?
-
-def initialize( initial=nil, design: nil,
-                             colors: nil )
-    if initial
-      ## pass image through as-is
-      img = initial
-    else
-      ## note: unwrap inner image before passing on to super c'tor
-      img = Pixelart::Image.parse( design, colors: colors ).image
-    end
-
-    super( img.width, img.height, img )
-end
-=end
-
-
-end  # class Image
-end  # module Punk

data/lib/cryptopunks/structs.rb

@@ -1,161 +0,0 @@
-
-module Punk
-### wrap metadata (e.g. punk types, accessories, etc.
-##     in structs for easy/easier access)
-
-
-
-class Metadata
-
-  ## nested class
-  class Type     ## todo/check: use alias family or such?
-     attr_reader :name,
-                 :limit
-     def initialize( name, limit )
-       @name  = name
-       @limit = limit
-     end
-     ## def to_s() @name; end
-
-     def inspect
-      %Q{<Type "#{@name}", limit: #{@limit}>}
-    end
-
-
-
-     def self.build
-       TYPES.reduce( {} ) do |h, rec|
-          type = Type.new( rec[:name], rec[:limit ] )
-          h[ rec[:name].downcase ] = type
-          h
-       end
-     end
-
-     def self.registry
-       ## auto-build registry (hash table) lookup (by name)
-       @@types ||= build
-       @@types
-     end
-
-     def self.all() registry.values; end
-
-     def self.find( q ) registry[ q.to_s.downcase ]; end
-  end  ## (nested) class Type
-
-
-
-  ## nested class
-  class AccessoryType
-     attr_reader :name,
-                 :accessories
-     def initialize( name, accessories=[] )
-       @name        = name
-       @accessories = accessories
-     end
-
-
-
-     def self.build
-       ACCESSORY_TYPES.reduce( {} ) do |h, rec|
-         type = AccessoryType.new( rec[:name] )
-         ## add all accessories
-         rec[:accessories].each do |rec_acc|
-           type.accessories << Accessory.new( rec_acc[:name],
-                                              type,
-                                              rec_acc[:limit].to_i )
-         end
-         h[ rec[:name].downcase ] = type
-         h
-       end
-     end
-
-     def self.registry
-       ## auto-build registry (hash table) lookup (by name)
-       @@types ||= build
-       @@types
-     end
-
-     def self.all() registry.values; end
-
-     def self.find( q ) registry[ q.to_s.downcase ]; end
-  end  ## (nested) class AccessoryType
-
-
-  ## nested class
-  class Accessory
-
-   attr_reader :name,
-               :type,
-               :limit
-   def initialize( name, type, limit )
-     @name  = name
-     @type  = type
-     @limit = limit
-   end
-
-
-   def inspect
-     %Q{<Accessory "#{@name}", type: "#{@type.name}", limit: #{@limit}>}
-   end
-
-
-
-   def self.build
-     AccessoryType.all.reduce( {} ) do |h, type|
-                                      type.accessories.each do |acc|
-                                        h[ acc.name.downcase ] = acc
-                                      end
-                                      h
-                                    end
-   end
-
-   def self.registry
-     ## auto-build registry (hash table) lookup (by name)
-     @@types ||= build
-     @@types
-   end
-
-   def self.all() registry.values; end
-
-   def self.find( q ) registry[ q.to_s.downcase ]; end
-end  ## (nested) class Accessory
-
-
-
-
-
-
-  attr_reader :id,
-              :type,
-              :accessories,
-              :birthday    ## todo/check: use minted or such?
-
-  def initialize( id, type, accessories )
-    @id          = id
-    @type        = type
-    @accessories = accessories
-    @birthday    = Date.new( 2017, 6, 23)   ## all 10,000 minted on June 23, 2017
-  end
-
-  def is_type?( name ) @type.name == name; end
-  alias_method :is?, :is_type?
-
-  ## convenience helpers for "classic" (5) types
-  def alien?()  is_type?( 'Alien'); end
-  def ape?()    is_type?( 'Ape' ); end
-  def zombie?() is_type?( 'Zombie' ); end
-  def female?() is_type?( 'Female' ); end
-  def male?()   is_type?( 'Male' ); end
-
-  ## convenience helpers to lookup attributes
-  def has_attribute?( name )
-    accessories.each do |acc|
-      return true  if acc.name == name
-    end
-    false
-  end
-  alias_method :has?,     :has_attribute?
-  alias_method :include?, :has_attribute?
-end # class Metadata
-
-end  # module Punk