c_crypt 0.1 → 0.2.1

data/README.rdoc

@@ -11,6 +11,12 @@ Ruby wrapper for the C crypt() function.
 * Only builds against Ubuntu
 * Probably not thread safe
 
+=== OS X
+
+Whilst the gem compiles and works on OS X, it's using the BSD crypt() function, not the GNU stdlib's function. This means you get a completely different hash back from it.
+
+The reason "support" for OS X has been added is so our developers who use Macs can still run the applications that lean on c_crypt locally.
+
 == SYNOPSIS:
 
 Use it exactly the same as +crypt()+, give it a string to hash, and a salt. The start of the salt determines what algorithm is used. 

data/Rakefile

@@ -2,7 +2,7 @@ require "rake/extensiontask"
 
 spec = Gem::Specification.new do |s|
   s.name = "c_crypt"
-  s.version = "0.1"
+  s.version = "0.2.1"
   s.author = "Caius Durling"
   s.email = "caius@brightbox.co.uk"
   s.homepage = "http://github.com/brightbox/c_crypt"
@@ -10,6 +10,7 @@ spec = Gem::Specification.new do |s|
   s.summary = "Ruby wrapper for the C crypt() function."
   s.files = FileList["ext/**/*", "lib/**/*.rb", "[A-Z]*"].to_a
   s.extensions = FileList["ext/**/extconf.rb"]
+  s.add_development_dependency "rake-compiler"
   s.has_rdoc = false
 end
 

data/ext/c_crypt/c_crypt.c

@@ -1,5 +1,9 @@
 #include <ruby.h>
+#ifdef __APPLE__
+#include <unistd.h>
+#else
 #include <crypt.h>
+#endif
 
 // Define our module constant
 VALUE CCrypt = Qnil;
@@ -10,7 +14,7 @@ void Init_c_crypt();
 // Prototype CCrypt.crypt3
 VALUE method_crypt3();
 
-// Define our module & method
+// Define CCrypt and the fact it has a class method called crypt3
 void Init_c_crypt() {
   CCrypt = rb_define_module("CCrypt");
   int arg_count = 2;
@@ -19,16 +23,13 @@ void Init_c_crypt() {
 
 // Implement CCrypt.crypt3
 VALUE method_crypt3(VALUE self, VALUE str_arg, VALUE salt_arg) {
+  // Convert args from ruby strings into char arrays
   char* str = RSTRING(str_arg)->ptr;
   char* salt = RSTRING(salt_arg)->ptr;
 
-//  printf("str: %s\n", str);
-//  printf("salt: %s\n", salt);
-
+  // Get back the hashed array string
   char *hashed = crypt(str, salt);
 
-//  printf("hashed: %s\n", hashed);
-  
+  // Cast it into a ruby string and return it
   return rb_str_new2(hashed);
 }
-

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: c_crypt
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 21
   prerelease: false
   segments: 
   - 0
+  - 2
   - 1
-  version: "0.1"
+  version: 0.2.1
 platform: ruby
 authors: 
 - Caius Durling
@@ -14,10 +15,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-24 00:00:00 +00:00
+date: 2010-08-24 00:00:00 +01:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rake-compiler
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id001
 description: 
 email: caius@brightbox.co.uk
 executables: []
@@ -29,7 +43,6 @@ extra_rdoc_files: []
 files: 
 - ext/c_crypt/c_crypt.c
 - ext/c_crypt/extconf.rb
-- Makefile
 - Rakefile
 - README.rdoc
 has_rdoc: true

data/Makefile

@@ -1,150 +0,0 @@
-
-SHELL = /bin/sh
-
-#### Start of system configuration section. ####
-
-srcdir = ext/c_crypt
-topdir = /usr/lib/ruby/1.8/i486-linux
-hdrdir = $(topdir)
-VPATH = $(srcdir):$(topdir):$(hdrdir)
-prefix = $(DESTDIR)/usr
-exec_prefix = $(prefix)
-sitedir = $(DESTDIR)/usr/local/lib/site_ruby
-rubylibdir = $(libdir)/ruby/$(ruby_version)
-docdir = $(datarootdir)/doc/$(PACKAGE)
-dvidir = $(docdir)
-datarootdir = $(prefix)/share
-archdir = $(rubylibdir)/$(arch)
-sbindir = $(exec_prefix)/sbin
-psdir = $(docdir)
-localedir = $(datarootdir)/locale
-htmldir = $(docdir)
-datadir = $(datarootdir)
-includedir = $(prefix)/include
-infodir = $(prefix)/share/info
-sysconfdir = $(DESTDIR)/etc
-mandir = $(prefix)/share/man
-libdir = $(exec_prefix)/lib
-sharedstatedir = $(prefix)/com
-oldincludedir = $(DESTDIR)/usr/include
-pdfdir = $(docdir)
-sitearchdir = $(sitelibdir)/$(sitearch)
-bindir = $(exec_prefix)/bin
-localstatedir = $(DESTDIR)/var
-sitelibdir = $(sitedir)/$(ruby_version)
-libexecdir = $(prefix)/lib/ruby1.8
-
-CC = cc
-LIBRUBY = $(LIBRUBY_SO)
-LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a
-LIBRUBYARG_SHARED = -l$(RUBY_SO_NAME)
-LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)-static
-
-RUBY_EXTCONF_H = 
-CFLAGS   =  -fPIC -fno-strict-aliasing -g -g -O2  -fPIC 
-INCFLAGS = -I. -I$(topdir) -I$(hdrdir) -I$(srcdir)
-DEFS     = -D_FILE_OFFSET_BITS=64
-CPPFLAGS =   $(DEFS)
-CXXFLAGS = $(CFLAGS) 
-DLDFLAGS = -L. -Wl,-Bsymbolic-functions -ltcmalloc_minimal -rdynamic -Wl,-export-dynamic  
-LDSHARED = $(CC) -shared
-AR = ar
-EXEEXT = 
-
-RUBY_INSTALL_NAME = ruby1.8
-RUBY_SO_NAME = ruby1.8
-arch = i486-linux
-sitearch = i486-linux
-ruby_version = 1.8
-ruby = /usr/bin/ruby1.8
-RUBY = $(ruby)
-RM = rm -f
-MAKEDIRS = mkdir -p
-INSTALL = /usr/bin/install -c
-INSTALL_PROG = $(INSTALL) -m 0755
-INSTALL_DATA = $(INSTALL) -m 644
-COPY = cp
-
-#### End of system configuration section. ####
-
-preload = 
-
-libpath = . $(libdir)
-LIBPATH =  -L. -L$(libdir)
-DEFFILE = 
-
-CLEANFILES = mkmf.log
-DISTCLEANFILES = 
-
-extout = 
-extout_prefix = 
-target_prefix = 
-LOCAL_LIBS = 
-LIBS = $(LIBRUBYARG_SHARED)  -ldl -lcrypt -lm   -lc
-SRCS = c_crypt.c
-OBJS = c_crypt.o
-TARGET = c_crypt
-DLLIB = $(TARGET).so
-EXTSTATIC = 
-STATIC_LIB = 
-
-RUBYCOMMONDIR = $(sitedir)$(target_prefix)
-RUBYLIBDIR    = $(sitelibdir)$(target_prefix)
-RUBYARCHDIR   = $(sitearchdir)$(target_prefix)
-
-TARGET_SO     = $(DLLIB)
-CLEANLIBS     = $(TARGET).so $(TARGET).il? $(TARGET).tds $(TARGET).map
-CLEANOBJS     = *.o *.a *.s[ol] *.pdb *.exp *.bak
-
-all:		$(DLLIB)
-static:		$(STATIC_LIB)
-
-clean:
-		@-$(RM) $(CLEANLIBS) $(CLEANOBJS) $(CLEANFILES)
-
-distclean:	clean
-		@-$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log
-		@-$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES)
-
-realclean:	distclean
-install: install-so install-rb
-
-install-so: $(RUBYARCHDIR)
-install-so: $(RUBYARCHDIR)/$(DLLIB)
-$(RUBYARCHDIR)/$(DLLIB): $(DLLIB)
-	$(INSTALL_PROG) $(DLLIB) $(RUBYARCHDIR)
-install-rb: pre-install-rb install-rb-default
-install-rb-default: pre-install-rb-default
-pre-install-rb: Makefile
-pre-install-rb-default: Makefile
-$(RUBYARCHDIR):
-	$(MAKEDIRS) $@
-
-site-install: site-install-so site-install-rb
-site-install-so: install-so
-site-install-rb: install-rb
-
-.SUFFIXES: .c .m .cc .cxx .cpp .C .o
-
-.cc.o:
-	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
-
-.cxx.o:
-	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
-
-.cpp.o:
-	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
-
-.C.o:
-	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
-
-.c.o:
-	$(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) -c $<
-
-$(DLLIB): $(OBJS)
-	@-$(RM) $@
-	$(LDSHARED) -o $@ $(OBJS) $(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS)
-
-
-
-$(OBJS): ruby.h defines.h